summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* removed transaction stufffix/import-data-issueJames Lopez2016-05-132-10/+2
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-05-1216-66/+81
|\ | | | | | | fix/import-data-issue
| * Merge branch '14272-forks-listed-when-permission-is-missing' into 'master' Rémy Coutable2016-05-121-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Only show forks for users who can download code The ForksController enforces this, so don't show the link if it won't go anywhere. Closes #14272. See merge request !4017
| | * Only show forks for users who can download codeSean McGivern2016-05-121-2/+2
| | | | | | | | | | | | | | | The ForksController enforces this, so don't show the link if it won't go anywhere.
| * | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-126-47/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area. ![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png) See merge request !4094
| | * | Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-areaGrzegorz Bizon2016-05-111-2/+2
| | | |
| | * | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-103-2/+3
| | | |
| | * | Reuse runners edit form in admin and project areaGrzegorz Bizon2016-05-103-44/+29
| | | |
| * | | Merge branch '3870-commit-sorting-issue' into 'master' Rémy Coutable2016-05-121-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group commits by date in server timezone `Time#to_date` just takes the (timezone-less) year, date, and month, and creates a new date from that. Because the commits in the list are grouped by date, rather than chunked when the date changes, a commit can be shown in the wrong order if its CommitDate has a timezone-less date that's different to other commits around it. Convert all CommitDates to the server timezone before grouping, as that will at least produce consistent results. Users can still see a timestamp on the commit that doesn't match the date it's grouped under, because the timestamp shown uses the user's local timezone, and the grouping uses the server's timezone, but that was an issue anyway. ### Before ![image](/uploads/1ffe0e2f86e03590cb96126d4f340436/image.png) ### After ![image](/uploads/b1be1b08782385d13c56528242a5829b/image.png) Closes #3870 and closes #17300. See merge request !4052
| | * | Group commits by date in server timezone3870-commit-sorting-issueSean McGivern2016-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Time#to_date` just takes the (timezone-less) year, date, and month, and creates a new date from that. Because the commits in the list are grouped by date, rather than chunked when the date changes, a commit can be shown in the wrong order if its CommitDate has a timezone-less date that's different to other commits around it. Convert all CommitDates to the server timezone before grouping, as that will at least produce consistent results. Users can still see a timestamp on the commit that doesn't match the date it's grouped under, because the timestamp shown uses the user's local timezone, and the grouping uses the server's timezone, but that was an issue anyway.
| * | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-114-2/+37
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-11105-1750/+165
| | |\ \ \ | | | | | | | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| | * | | | Code improveLong Nguyen2016-05-101-11/+11
| | | | | |
| | * | | | Routing refactoringLong Nguyen2016-05-085-10/+10
| | | | | |
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-08157-515/+897
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| | * | | | | user routings refactorLong Nguyen2016-05-087-12/+43
| | | | | | |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-05107-748/+1092
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| | * | | | | Remove unused view and update redirect when destroy snippetLong Nguyen2016-05-052-14/+1
| | | | | | |
| | * | | | | Remove unused code, update spec, and update changelogLong Nguyen2016-05-051-19/+1
| | | | | | |
| | * | | | | Add snippet tab under user profileLong Nguyen2016-05-023-1/+36
| | | | | | |
| * | | | | | Merge branch 'rs-remove-icon_for_event' into 'master' Douwe Maan2016-05-111-9/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `icon_for_event` helper Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4120
| | * | | | | | Remove unused `icon_for_event` helperRobert Speicher2016-05-111-9/+0
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'no-todo-badge-on-zero' into 'master' Jacob Schatz2016-05-111-2/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show the Todo count if there aren't any Todos. When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying. Follow-up on !4077. **Before:** ![Screen_Shot_2016-05-10_at_9.36.57_PM](/uploads/e0dfafae01692286096606c3251f0997/Screen_Shot_2016-05-10_at_9.36.57_PM.png) **After:** ![Screen_Shot_2016-05-10_at_10.01.02_PM](/uploads/30a8bafe8f54862418eb4045e5777a9a/Screen_Shot_2016-05-10_at_10.01.02_PM.png) cc: @jschatz1 @rspeicher See merge request !4113
| | * | | | | | Don't show the Todo count if there aren't any Todos.Connor Shea2016-05-101-2/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying. Follow-up on !4077.
| * | | | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-112-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
| | * | | | | | Remove extra sanitizationJacob Vosmaer2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Robert Speicher and I believe this string gets sanitized further down the stack anyway. Doing this in a model class feels wrong.
| | * | | | | | Always mention HTTP statusJacob Vosmaer2016-05-031-1/+1
| | | | | | | |
| | * | | | | | Inform user about questionable hook successJacob Vosmaer2016-05-031-2/+4
| | | | | | | |
| | * | | | | | Improve documentation and web test for web hooksJacob Vosmaer2016-05-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wanted to share what I learned trying to debug web hooks using netcat.
* | | | | | | | more changes based on MR feedbackJames Lopez2016-05-122-3/+2
| | | | | | | |
* | | | | | | | rename methodJames Lopez2016-05-121-2/+2
| | | | | | | |
* | | | | | | | fix silly typoJames Lopez2016-05-121-0/+2
| | | | | | | |
* | | | | | | | Merge branches 'fix/import-data-issue' and 'master' of ↵James Lopez2016-05-11104-1724/+161
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue
| * | | | | | | Merge branch 'improve-destroy-logging' into 'master' Robert Speicher2016-05-111-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve log message when a project is destroyed to include the namespace See merge request !4114
| | * | | | | | | Improve log message when a project is destroyed to include the namespaceStan Hu2016-05-101-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-113-2/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict starred projects to viewable ones `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects. Closes #17249. See merge request !4108
| | * | | | | | | | Tidy up user project specsSean McGivern2016-05-111-1/+1
| | | | | | | | | |
| | * | | | | | | | Restrict starred projects to viewable onesSean McGivern2016-05-103-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects.
| * | | | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' ↵Robert Speicher2016-05-112-7/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Only generate repository push email once The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.) Closes #17270. See merge request !4070
| | * | | | | | | | | Only generate repository push email onceSean McGivern2016-05-112-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.)
| * | | | | | | | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop Casecmp Performance Cop. Also fixes the errors caused by enabling the cop. `casecmp` is more performant than `.downcase` and `==`. See also: https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/cop/performance/casecmp.rb See merge request !3957
| | * | | | | | | | | Enable Rubocop Casecmp Performance Cop.Connor Shea2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes the errors caused by enabling the cop. casecmp is more performant than `.downcase` and `==`.
| * | | | | | | | | | Merge branch 'fix-r-shortcut' into 'master' Jacob Schatz2016-05-101-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore "r" shortcut Fixes "Reply with Selected Text" shortcut See merge request !4041
| | * | | | | | | | | | Restore "r" shortcutfix-r-shortcutAlfredo Sumaran2016-05-041-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add eager load paths to help prevent dependency load issues with Sidekiq workers _Originally opened at !3545 by @stanhu._ - - - Relevant resources: - https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code - https://github.com/mperham/sidekiq/issues/1281#issuecomment-27129904 - http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload - https://github.com/rails/rails/blob/52ce6ece8c8f74064bb64e0a0b1ddd83092718e1/railties/lib/rails/engine.rb#L472-L479 - https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/paths.rb Attempts to address #3661, #11896, #12769, #13521, #14131, #14589, #14759, #14825. See merge request !3724
| | * | | | | | | | | | | Fix a few places where autoloading would failRémy Coutable2016-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix naming of API::CommitStatuses - Ensure we use require_dependency instead of require - Ensure the namespace is right in lib/api/api.rb, otherwise, we might require Grape::API::Helpers which defines the `#params` method. This is to avoid requiring a file multiple times and getting an "Already initialized constant" error. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master' Robert Speicher2016-05-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue when filtering merge requests with more than one label Fixes #15529. See merge request !3886
| | * | | | | | | | | | | | Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-101-2/+2
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Merge branch 'issue_15673' into 'master' Jacob Schatz2016-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to label ID to response Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15673 See merge request !4023
| | * | | | | | | | | | | Add to label :id to responseissue_15673Alfredo Sumaran2016-05-031-1/+1
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |