summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make files list more compact by reducing row height from 47px to 44pxcompact-files-listDmitriy Zaporozhets2016-05-021-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-changelog' into 'master' Robert Speicher2016-05-021-1/+0
|\ | | | | | | | | | | | | Remove duplicate entry in the CHANGELOG [ci skip] See merge request !4002
| * Remove duplicate entry in the CHANGELOGDmitriy Zaporozhets2016-05-021-1/+0
| |
* | Merge branch 'feature/backport-safewebhooks' into 'master' Robert Speicher2016-05-0212-31/+89
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | Backported minimal safewebhook implementation to GitLab CE This brings a minimal implementation for gitlab-org/gitlab-ce#13478 backported from EE (gitlab-org/gitlab-ee!334). Also added UI to configure Secret Token Fixes #15365. See merge request !3940
| * Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-024-6/+31
| | | | | | | | Codestyle changes to easy EE merge
| * Backported minimal safewebhook implementation to GitLab CEGabriel Mazetto2016-04-308-25/+58
| |
* | Merge branch 'fix-github-oauth-instructions' into 'master' Achilleas Pipinellis2016-05-011-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Fix the GitHub Omniauth instructions Technically the screenshot is also out of date, but I honestly don't care enough to go through the effort of making a sample application, taking a screenshot, etc. See merge request !3976
| * | Fix the GitHub Omniauth instructionsAlex Jordan2016-04-281-1/+3
| | |
* | | Merge branch 'fix/handle-issue-move-access' into 'master' Robert Speicher2016-04-302-0/+41
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Handle issue move access instead of raising error Closes #15533 See merge request !3990
| * | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-302-0/+41
| | | | | | | | | | | | Closes #15533
* | | Merge branch 'add-parameters' into 'master' Robert Speicher2016-04-301-1/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more parameters to the filter_parameters config. Adds Sentry DSN, Webhooks, Deploy Keys, etc. Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences. This also seems to be the more popular syntax for adding new parameters, from what I can find. In the future we may want to [increase the specificity of some of these](http://blog.bigbinary.com/2016/03/07/parameter-filtering-enhacement-rails-5.html) once Rails 5 is out. e.g. instead of `:hook`, `"hook.url"` would be just as effective without removing potentially useful information from the logs. cc: @stanhu See merge request !3971
| * | | Add more parameters to the filter_parameters config.Connor Shea2016-04-291-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Sentry DSN, Webhooks, Deploy Keys, etc. Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences. This also seems to be the more popular syntax for adding new parameters, from what I can find.
* | | | Merge branch 'check-protected-branches' into 'master' Robert Speicher2016-04-293-10/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up/tweaked Project#open_branches See commit c825404572040a3a45cb9e2b3d3e7d64900f66c9 for the details of the changes and https://gitlab.com/gitlab-org/gitlab-ce/issues/14280#note_4973648 for more information. See merge request !3985
| * | | | Tweak checking branches in Project#open_branchesYorick Peterse2016-04-292-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes 4 things: 1. Project#protected_branches_names has been renamed to Project#protected_branch_names. 2. Project#open_branches uses a Set for the branch names as checking values in a Set is faster than checking values in a (large) Array. 3. Some redundant code in Project#open_branches has been removed. 4. Project#protected_branch_names now uses #pluck instead of #map, removing the need for loading entire DB records into memory.
| * | | | Use a query in Project#protected_branch?Yorick Peterse2016-04-292-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes Project#protected_branch? to use a query to check if a branch is protected, instead of loading all ProtectedBranch records into memory just to check if the list of names includes a given branch name.
* | | | | Merge branch 'fix-docs-links' into 'master' Drew Blessing2016-04-293-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix some broken links in the documentation [ci skip] cc: @dblessing @axil See merge request !3982
| * | | | Fix some broken links in the documentation [ci skip]Connor Shea2016-04-293-3/+3
|/ / / /
* | | | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-04-292-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Doorkeeper from 2.2.2 to 3.1.0 I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310 Working toward #14286. See merge request !3644
| * | | | Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea2016-04-282-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
* | | | Merge branch 'sentry-filter' into 'master' Robert Speicher2016-04-291-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Rails filtered parameters from leaking to Sentry. As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/ See merge request !3974
| * | | | Prevent Rails filtered parameters from leaking to Sentry.Connor Shea2016-04-281-0/+3
| |/ / / | | | | | | | | | | | | As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/
* | | | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-04-294-20/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move modal css to separate file and fix danger text for confirmation modal * in help file I found css for modal that affect whole application -> moved to separate file * fixed ugly confirmation message when remove project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3979
| * | | | Move modal css to separate file and fix danger text for confirmation modalDmitriy Zaporozhets2016-04-294-20/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'duplicate-label-dropdown' into 'master' Jacob Schatz2016-04-293-2/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes duplicates from the label dropdown It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted. I liked your idea @jschatz1 of using a standard icon color. However, with this i've taken all the duplicated colors & made a little gradient with them so it still half resembles the label colors (this has been limited to 4 or it could get crazy!) ![Screen_Shot_2016-04-28_at_10.35.04](/uploads/41f45f3f92f971e7f38df7a98765cb9d/Screen_Shot_2016-04-28_at_10.35.04.png) Closes #16555, #14820 See merge request !3963
| * | | | | Update CHANGELOGduplicate-label-dropdownJacob Schatz2016-04-291-0/+1
| | | | | |
| * | | | | Removes duplicates from the label dropdownPhil Hughes2016-04-292-2/+67
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted. Closes #16555
* | | | | Merge branch 'notification-email-badge-alignment' into 'master' Jacob Schatz2016-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated spacing between notification label and button ![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png) Closes #16552 See merge request !3965
| * | | | | Updated spacing between notification label and buttonnotification-email-badge-alignmentPhil Hughes2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #16552
* | | | | | Merge branch 'emoji_award_coffee_refactoring' into 'master' Jacob Schatz2016-04-293-94/+102
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | AwardsHandler follows code style conventions See merge request !3871
| * | | | | awards_handler: single quotesemoji_award_coffee_refactoringValery Sizov2016-04-261-64/+64
| | | | | |
| * | | | | AwardsHandler follows code style conventionsValery Sizov2016-04-263-42/+50
| | | | | |
* | | | | | Merge branch 'gitattributes' into 'master' Rémy Coutable2016-04-298-16/+77
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support supressing text file diffs on the default branch with .gitattributes This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch. When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed. ![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png) I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`. Fixes and closes gitlab-org/gitlab-ce#2315. See merge request !3806
| * | | | | Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-298-16/+77
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
* | | | | Merge branch 'fix/remove-deprecated-ci-helper' into 'master' Rémy Coutable2016-04-291-13/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated CI badge helper Closes #13446 See merge request !3977
| * | | | | Remove deprecated CI badge helperGrzegorz Bizon2016-04-291-13/+0
| |/ / / / | | | | | | | | | | | | | | | Closes #13446
* | | | | Merge branch 'change_message_for_newly_created_milestone' into 'master' Rémy Coutable2016-04-294-3/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a better message when milestone is newly created closes #14982 See merge request !3925
| * | | | | Use a better message when milestone is newly createdchange_message_for_newly_created_milestoneArinde Eniola2016-04-294-3/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make some changes for the checks to determine when the messages should be displayed add item to changelog and also integration test make some changes to the test make some changes
* | | | | Merge branch 'fix-changelog' into 'master' Yorick Peterse2016-04-291-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed CHANGELOG for 8.7.1/8.7.2 See merge request !3978
| * | | | | Fixed CHANGELOG for 8.7.1/8.7.2Yorick Peterse2016-04-291-2/+4
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'dz-update-outdated-colors' into 'master' Jacob Schatz2016-04-292-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Replace outdated bluish colors with default bg color cc @skyruler See merge request !3973
| * | | | Replace outdated bluish colors with default bg colordz-update-outdated-colorsDmitriy Zaporozhets2016-04-282-3/+3
| | | | |
* | | | | Merge branch 'zj-large-files-no-highlight' into 'master' Robert Speicher2016-04-287-16/+44
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Properly handle bigger files Closes #3967 See merge request !3718
| * | | | Properly handle bigger filesZeger-Jan van de Weg2016-04-287-16/+44
| | | | |
* | | | | Merge branch 'async-new-branch-button' into 'master' Jacob Schatz2016-04-287-11/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load the "New Branch" button asynchronously Here's how it looks like for logged in users: ![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif) And here it is for anonymous users (or when a new branch can't be created by a logged in user): ![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif) See merge request !3855
| * | | | | Load the "New Branch" button asynchronouslyYorick Peterse2016-04-287-11/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
* | | | | | Merge branch 'protected-branches-ui' into 'master' Jacob Schatz2016-04-283-59/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protected branches UI ![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png) ![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png) Closes #14027 See merge request !3929
| * | | | | | Protected branches UIprotected-branches-uiPhil Hughes2016-04-265-59/+77
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes #14027
* | | | | | Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz2016-04-284-87/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project webhooks updated UI Closes #13993 ![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png) ![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png) See merge request !3922
| * | | | | | Updated testsproject-webhooks-uiPhil Hughes2016-04-261-2/+2
| | | | | | |
| * | | | | | Project webhooks updated UIPhil Hughes2016-04-263-85/+101
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes #13993