9a26e9a0d6
Dont init repo on every create(:repo)
2013-04-01 17:27:44 +03:00
541d899410
Project.repository should never be nil so you can call repository.exists? or repository.empty?
...
Also specify separate project factory for project with filled repo
2013-04-01 16:56:25 +03:00
49b024f5f5
Use Gitlab::Git:: for git features across application
2013-04-01 16:04:35 +03:00
bb06e905ef
added Gitlab::Git::Compare for git compare feature
2013-04-01 16:03:11 +03:00
51c167554c
added Gitlab::Git::Blame for git blame feature
2013-04-01 16:02:54 +03:00
22817398e6
define TestEnv and keep all global stubs in one place
2013-04-01 14:39:19 +03:00
bbfbff3add
Extend models functionality with old decorator methods. Use Repository model
2013-03-31 23:48:12 +03:00
2a6b4f965e
rake task to clear redis cache
2013-03-31 23:45:58 +03:00
26323046fd
Decorate Gitlab::Git::Commit with Commit
2013-03-31 19:00:45 +03:00
9dc644635f
Fix tests and remove app/models/repository.rb
2013-03-31 18:50:17 +03:00
676bce2ab9
Move Commit and Repository logic to lib/gitlab/git
2013-03-31 18:49:06 +03:00
f1b369b57d
Fixed: gitlab-shell version check error message
2013-03-28 11:03:00 -05:00
63e6f055f1
Fix notify specs. Fix merge request close via api
2013-03-28 13:24:01 +02:00
53e54ddf8a
require gitlab-shell v1.2.0 now
2013-03-25 15:19:06 +02:00
b6641d6932
Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file
2013-03-24 11:26:57 +02:00
c4299bb45a
Move directory logic out of model. Use Gitlab:Shell class to interact with file system
2013-03-21 22:11:08 +02:00
0103363191
replace Gitolited mixin with Gitlab::ShellAdapter
2013-03-21 21:01:14 +02:00
a1fe375e44
Fix 404 error while displaying json files.
...
It uses params[:id] instead of request.fullpath.
It should fix #3132 .
2013-03-21 15:10:14 +00:00
316cf61965
Merge pull request #3247 from Undev/feature/fix_bug_in_team_assigment
...
Fix bug with downgrade permissions on first project assigment to team
2013-03-20 00:35:24 -07:00
397c3da975
Fix user path in markdown
2013-03-19 21:29:59 -03:00
3b42c267a6
Dont show blocked users in autocomplete
2013-03-19 18:07:14 +02:00
124a5e270e
add attachemnts support for wall
2013-03-19 13:28:29 +02:00
4d378f3c9a
load notes for wall via api
2013-03-19 12:35:55 +02:00
a15fe61fb0
API docs updated
2013-03-19 04:47:08 +00:00
28e7d1a8bf
Abilities added to /user and /sign_in requests
2013-03-18 20:11:28 +00:00
0f39610532
Add control of action in project to team assigment
2013-03-18 16:07:04 +04:00
a0f2fbc250
Fix bug with downgrade permissions on first project assigment to team
2013-03-18 15:44:26 +04:00
3513902396
Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests
...
Fix failure of cheking a merge request after conflict.
2013-03-18 03:39:51 -07:00
415bade302
Result of misspellings run.
...
Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check
It runs mostly clean now.
2013-03-17 19:46:54 +00:00
77295b00b8
Fix the order of clearing a satellite
2013-03-17 23:50:20 +09:00
330fe4162e
Fix Wiki migration task and add more test coverage.
...
There was an error in the #extract_attributes_from_page method that
caused an exception when checking to see if a page named "Home"
already exists.
The check occurs to handle the renaming of the main index page to
"Home" to match the Gollum standard. If there is already a page
called "Home" then the migrator will leave that page and create
the Index page as usual. Users will need to manually rename their
old "Home" page to something else then rename their "Index" page
to "Home". Fortunately, I would be highly surprised if this case
ever comes up.
I also added more verbosity to the logging so if an error does
occur, it will be easier to track down which Wiki page is causing
the problem.
2013-03-16 18:01:48 -07:00
cf848fd06d
Merge pull request #3217 from chrislawlor/2437
...
Adds DB-sensitive tablename escape for backup task.
2013-03-16 02:26:01 -07:00
71ab011a17
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
...
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
2013-03-15 16:55:07 +02:00
3df5253cc3
Adds DB-sensitive tablename escape for backup task.
...
Uses ActiveRecord::Base.connection.quote_table_name.
Fixes issue 2437.
2013-03-14 13:30:25 -04:00
bf17d976a7
add api users filter and integrate users select2
2013-03-13 23:19:09 +02:00
70fc1c5021
cleanup ProjectMover
2013-03-12 14:13:25 +02:00
147b93ee3e
check gitlab-shell version in gitlab:check
2013-03-12 12:53:07 +02:00
59b36f2032
Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0
2013-03-12 12:37:53 +02:00
11b57d979c
Reduce amount of user info provided with internal api
2013-03-11 14:35:00 +02:00
f0aa54e0fb
Create Wiki migration task.
...
This commit adds a new Rake task for migrating all of your existing
Wiki content from your database into new Gollum repositories.
The bulk of the logic happens within the `WikiToGollumMigrator`
class which is decently test covered and located in the lib directory.
The new Rake task can be executed by running:
`bundle exec rake gitlab:wiki:migrate`
It will output a nice log of every project that it migrates along
with success or failure messages.
I have used it on my own installation to migrate my Wikis successfully.
2013-03-10 19:10:44 -07:00
ea9b3687db
Replace current Wiki system with Gollum Wikis.
...
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
2013-03-09 16:39:51 -08:00
562de2a438
Merge branch 'master' into api/system_hooks_adjustments
2013-03-07 17:59:27 +01:00
32f1eaaf0f
API: system hooks API functions and documentation updated
...
* updated system hooks documentation and code comments
* fixed access to system hooks if no user given resulting in a `500 Server Error`
* added tests
2013-03-07 17:56:11 +01:00
a7055be1fd
Merge pull request #2835 from Asquera/fixes/api
...
Fix API return codes
2013-03-07 08:33:34 -08:00
ecf53bb9e6
API: fixes project creation and removed redundant info
2013-03-07 15:11:33 +01:00
3374027e3a
Merge branch 'master' into fixes/api, code clean up and tests fixed
...
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00
d2cec12632
block user should not be able to push
2013-03-07 14:18:30 +02:00
9c2a6e2013
Merge pull request #3047 from mikew/capistrano-deploy-example
...
Capistrano deploy example
2013-03-07 02:08:11 -08:00
7c408960ce
Merge pull request #3146 from amacarthur/AdminAPIs
...
Additional Admin APIs
2013-03-06 22:57:24 -08:00
afee5303ff
Merge pull request #3149 from m4tthumphrey/api-deploy-keys
...
Added methods to manage project deploy keys via API
2013-03-06 07:43:45 -08:00
Dmitriy Zaporozhets
Evan Wondrasek
Sato Hiroyuki
Martin Bastien
Alex Denisov
Andrey Kumanyaev
Kevin Lyda
murank
Dan Knox
Chris Lawlor
Sebastian Ziebell