summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Changed the placement of Restricted Domainsapplication_settings_formDarby2015-06-231-6/+8
|
* Updated the categories of Application Settings FormDarby2015-06-233-54/+59
|
* Merge branch 'fix-readme-avatar' into 'master'Dmitriy Zaporozhets2015-06-231-1/+1
|\ | | | | | | | | | | | | | | Revert README avatar to original version In my attempt to rid the world of `gitlab_logo.png`, I didn't realize that http://about.gitlab.com was hosted somewhere else and hence the original link worked fine. See merge request !876
| * Revert avatar URL to original versionStan Hu2015-06-231-1/+1
|/
* Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-2323-73/+91
|\ | | | | | | | | | | | | | | Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
| * Replace GITLAB with GitLab in rake task descriptionsDmitriy Zaporozhets2015-06-2319-37/+37
| |
| * Refactor rake tasks for testsDmitriy Zaporozhets2015-06-233-29/+25
| |
| * Split rspec and spinach tests in parallelDmitriy Zaporozhets2015-06-231-7/+29
| |
* | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-236-3/+47
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix downloading of patches on public merge requests when user logged out ### What does this MR do? This MR makes it possible to download a diff patch on a public merge request when a user is logged out. ### Why was this MR needed? An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button: ``` NoMethodError - undefined method `id' for nil:NilClass: lib/gitlab/backend/shell_env.rb:9:in `set_env' lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite' lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite' app/models/merge_request.rb:219:in `to_diff' app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show' ``` ### What are the relevant issue numbers? * Closes #1225 * Closes #1854 (dup) * Closes #1858 (dup) See merge request !872
| * Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-236-3/+47
| | | | | | | | | | | | Closes #1225 Closes #1854 Closes #1858
* | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-2316-238/+424
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Admin can see, edit and remove user identities Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !843
| * | Fix tests for admin identities after migrate to rspec3Dmitriy Zaporozhets2015-06-231-5/+2
| | |
| * | Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-2318-94/+175
| |\ \
| * | | Set proper title when edit identity from admin areaDmitriy Zaporozhets2015-06-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix admin identities codeDmitriy Zaporozhets2015-06-232-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix code style issueDmitriy Zaporozhets2015-06-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-22225-1059/+1836
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
| * | | | Fix indendity testDmitriy Zaporozhets2015-06-223-6/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor admin user pageDmitriy Zaporozhets2015-06-228-235/+245
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-222-3/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Minor improvements to admin identities textDmitriy Zaporozhets2015-06-222-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add tests for admin managing user identitiesDmitriy Zaporozhets2015-06-192-1/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move identities list to own controller actionDmitriy Zaporozhets2015-06-194-18/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-196-6/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-195-0/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-delete-user-error' into 'master'Dmitriy Zaporozhets2015-06-236-3/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when deleting a user who has projects ### What does this MR do? This MR fixes an error that prevented users from being deleted in the Admin page if the user had personal projects. ### Why was this MR needed? Deleting a user who had projects would result in an error such as this: ``` Started DELETE "/admin/users/tdb1" for MYIP at 2015-06-22 20:53:02 +0100 Processing by Admin::UsersController#destroy as HTML Parameters: {"authenticity_token"=>"[FILTERED]", "id"=>"tdb1"} Completed 500 Internal Server Error in 30ms (ActiveRecord: 6.7ms) NameError (undefined local variable or method `current_user' for #<DeleteUserService:0x0000000cd01d38>): app/services/delete_user_service.rb:10:in `block in execute' app/services/delete_user_service.rb:7:in `execute' app/controllers/admin/users_controller.rb:89:in `destroy' ``` ### What are the relevant issue numbers? * Closes #1856 * Closes https://github.com/gitlabhq/gitlabhq/issues/9394 See merge request !868
| * | | | | Fix error when deleting a user who has projectsStan Hu2015-06-236-3/+34
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394
* | | | | Merge branch 'fix-issue-1771-2' into 'master'Douwe Maan2015-06-232-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed invalid timestamps in RSS feed #1771 Fixed invalid timestamps in RSS feed by using rfc3339 #1771 See merge request !870
| * | | | Fixed invalid timestamps in RSS feed #1771Rowan Wookey2015-06-232-1/+2
| | |/ / | |/| |
* | | | Merge branch 'rubocop-for-tests' into 'master'Dmitriy Zaporozhets2015-06-2395-530/+583
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable rubocop for tests too cc @DouweM @rspeicher Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !862
| * | | | Fix rubocop issues after merge of recent masterDmitriy Zaporozhets2015-06-232-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-23122-616/+735
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
| * | | | | Fix Style/NonNilCheck cop violationsrubocop-for-testsStan Hu2015-06-221-1/+1
| | | | | |
| * | | | | Fix Style/IndentationWidth cop violationsStan Hu2015-06-224-8/+8
| | | | | |
| * | | | | Fix Style/CaseIndentation cop violationsStan Hu2015-06-221-10/+10
| | | | | |
| * | | | | Fix Style/AlignHash cop violationsStan Hu2015-06-2215-80/+178
| | | | | |
| * | | | | Fix bad multi-line split from previous commitRobert Speicher2015-06-221-1/+2
| | | | | |
| * | | | | Fix Style/Blocks cop violationsRobert Speicher2015-06-2234-213/+197
| | | | | |
| * | | | | Fix Style/CommentIndentation cop violationRobert Speicher2015-06-221-7/+7
| | | | | |
| * | | | | Fix Style/HashSyntax violationsRobert Speicher2015-06-223-3/+3
| | | | | |
| * | | | | Fix Style/Not cop violationsRobert Speicher2015-06-221-2/+2
| | | | | |
| * | | | | Fix Style/AsciiComments cop violationRobert Speicher2015-06-221-1/+1
| | | | | |
| * | | | | Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher2015-06-2218-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | These fixes were performed automatically by Rubocop's `-a` flag.
| * | | | | Fix Style/TrailingBlankLines cop violationsRobert Speicher2015-06-2212-26/+1
| | | | | |
| * | | | | Fix Style/IndentationConsistency cop violationsRobert Speicher2015-06-223-7/+5
| | | | | |
| * | | | | Fix part of api specs for rubocopDmitriy Zaporozhets2015-06-224-84/+84
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Remove unnecessary whitespace between let and (Dmitriy Zaporozhets2015-06-227-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix rubocop issues at feature/ directoryDmitriy Zaporozhets2015-06-229-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Enable rubocop for tests tooDmitriy Zaporozhets2015-06-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status