summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Initial CSS change to move buttons to correct position.issue-from-noteJacob Schatz2016-05-112-4/+12
|
* Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-115-6/+21
|\ | | | | | | | | | | | | | | 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.
| * Fix test failuresJacob Vosmaer2016-05-092-3/+3
| |
| * Remove spaceJacob Vosmaer2016-05-091-1/+1
| |
| * 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-033-2/+15
| | | | | | | | | | I wanted to share what I learned trying to debug web hooks using netcat.
* | Merge branch '17356-remove-monkey_patch' into 'master' Robert Speicher2016-05-111-48/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6 Closes #17356. See merge request !4115
| * | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | 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-116-15/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112-14/+9
| | | | |
| * | | | Restrict starred projects to viewable onesSean McGivern2016-05-106-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-117-55/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-117-55/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'update-changelog-874' into 'master' Yorick Peterse2016-05-111-3/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Updated 8.7.4 CHANGELOG entries See merge request !4116
| * | | | | Updated 8.7.4 CHANGELOG entriesYorick Peterse2016-05-111-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-114-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-104-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes the errors caused by enabling the cop. casecmp is more performant than `.downcase` and `==`.
* | | | | | | Merge branch 'string-replacement-cop' into 'master' Rémy Coutable2016-05-112-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the StringReplacement cop. Also fix one use of `gsub` that would be faster as `delete`. Use `tr` instead of `gsub` when you are replacing the same number of characters. Use `delete` instead of `gsub` when you are deleting characters. See merge request !3960
| * | | | | | Enable the StringReplacement cop.Connor Shea2016-05-102-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix one use of `gsub` that would be faster as `delete`. Use `tr` instead of `gsub` when you are replacing the same number of characters. Use `delete` instead of `gsub` when you are deleting characters.
* | | | | | Merge branch 'jquery-scrollto' into 'master' Jacob Schatz2016-05-113-4/+210
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes jquery-scrollto-rails. Instead the script is now included directly from the vendor directory. Resolves #17166. Working towards #14286 and merging !3775. The gem was on 1.4.3.1, here's the diff between that tag and 2.1.2 (the version I'm using in this MR): https://github.com/flesler/jquery.scrollTo/compare/1.4.3...2.1.2 There aren't any notable breaking changes that I noticed, and I didn't see any JS errors after testing a bunch of pages. cc: @jschatz1 See merge request !4088
| * | | | | | Removes jquery-scrollto-rails.Connor Shea2016-05-103-4/+210
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead the script is now included directly from the vendor directory. Resolves #17166.
* | | | | | 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-1011-191/+200
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1011-190/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | | | | | | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-102-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to address #13521, #14825 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'issue_13987' into 'master' Stan Hu2016-05-103-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Ace Editor Upgrading fixes scroll navigation on mobile. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 ![scroll](/uploads/fd655fa6033ddc0337080c89c3fbf92f/scroll.gif) See merge request !3823
| * | | | | | | | Update CHANGELOGAlfredo Sumaran2016-05-101-0/+1
| | | | | | | | |
| * | | | | | | | Update Ace EditorAlfredo Sumaran2016-05-102-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master' Robert Speicher2016-05-103-2/+140
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-2/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master' Robert Speicher2016-05-102-38/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove broken inline runner description edit form This remove inline form for editing runnner's description. It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description. See merge request !4095
| * | | | | | | Use abbrevation in runners table in admin areaGrzegorz Bizon2016-05-101-1/+1
| | | | | | | |
| * | | | | | | Remove broken inline runner description edit formGrzegorz Bizon2016-05-092-38/+2
| | | | | | | |
* | | | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-103-1/+26
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085
| * | | | | | | Do not process upload links if no project contextGrzegorz Bizon2016-05-102-5/+9
| | | | | | | |
| * | | | | | | Add Changelog entry for upload link in snippet fixGrzegorz Bizon2016-05-101-0/+1
| | | | | | | |
| * | | | | | | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-102-1/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes #17342, closes #17363
* | | | | | | Change dashboard button color to white on hoverDmitriy Zaporozhets2016-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Minor consistency fixes to sidebar & headerDmitriy Zaporozhets2016-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'mobile-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-108-9/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide navbar on mobile Part of #14838 Closes #17323 <img src="/uploads/33d2dbc17e94329891108c4e80d4aff3/nav.gif" width="800px"> See merge request !4103
| * | | | | | | Fix media queries for absolutely positioned nav elementAnnabel Dunstone2016-05-093-4/+14
| | | | | | | |
| * | | | | | | Hide navbar on mobileAnnabel Dunstone2016-05-097-6/+95
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-10145-2734/+232
|\ \ \ \ \ \ \ \