18 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
15 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
11 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
07 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
06 Nov, 2013
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
29 Oct, 2013
1 commit
16 Oct, 2013
1 commit
14 Oct, 2013
1 commit
10 Oct, 2013
3 commits
-
Change-Id: Id2cae87c8cd383bc6cbcbdecf0f77c161bb82eab
-
Change-Id: I2b0752bc2593a944d42dde0ffe0ef9ce408228a5
-
defaults to HEAD Conflicts: spec/requests/api/repositories_spec.rb Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
09 Oct, 2013
1 commit
07 Oct, 2013
1 commit
30 Sep, 2013
1 commit
29 Sep, 2013
4 commits
-
Extended User API to expose admin and can_create_group for user creation...
-
* dont allow protect/unprotect branches for users without master permissions * dont allow access to Repository api for guests
-
Also, is_admin and can_create_group are exposed in the user information. Fixed attributes_for_keys to process properly keys with boolean values (since false.present? is false).
26 Sep, 2013
1 commit
23 Sep, 2013
1 commit
-
GITLAB-1283 (GITLAB-869) Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded Conflicts: config/initializers/1_settings.rb
22 Sep, 2013
1 commit
-
Fixes #5144 Refs #4996
17 Sep, 2013
1 commit
14 Sep, 2013
1 commit
13 Sep, 2013
1 commit
11 Sep, 2013
2 commits
-
-calling build_user will now apply defaults and only override them if as: :admin is set Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
-
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
09 Sep, 2013
3 commits
-
Change-Id: I966bfd0ccc4b05925384ecab8c6cbe3c6ba3b667
-
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
-
-Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
05 Sep, 2013
1 commit
-
Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
04 Sep, 2013
1 commit
-
Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
27 Aug, 2013
1 commit
-
Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line with existing api urls (e.g. "/projects/:id", etc.) Fix 500 error resulting from a diff api call with an invalid commit hash Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for backwards compatibility. Add ability to get a single commit via "/commits/:sha"
25 Aug, 2013
1 commit
08 Aug, 2013
1 commit
-
Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
30 Jul, 2013
2 commits
-
Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
29 Jul, 2013
1 commit
17 Jul, 2013
3 commits
-
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
Change-Id: Ic23cb46901f8adc77943bf3cc79566587364e22a
-
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05