summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated the filename regexupdate-filenames-regexLuke "Jared" Bennett2017-02-07254-50/+41
|
* Merge branch 'fix-anchor-scrolling' into 'master' Clement Ho2017-02-073-0/+20
|\ | | | | | | | | | | | | Fix broken anchor links when special characters are used Closes #26778 See merge request !8961
| * Fix broken anchor links when special characters are usedAndrey Krivko2017-02-073-0/+20
| |
* | Merge branch 'dont-fail-master-if-js-coverage-isnt-generated' into 'master' Robert Speicher2017-02-071-3/+3
|\ \ | | | | | | | | | | | | Don't fail the build if there is no coverage files See merge request !9037
| * | Don't fail the build if there is no coverage filesRémy Coutable2017-02-071-3/+3
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '26059-segoe-ui-vertical' into 'master' Filipa Lacerda2017-02-074-2/+11
|\ \ | | | | | | | | | | | | Align Segoe UI label text See merge request !8884
| * | Align Segoe UI label text26059-segoe-ui-verticalAnnabel Dunstone Gray2017-02-074-2/+11
| | |
* | | Merge branch 'timeago-perf' into 'master' Alfredo Sumaran2017-02-073-101/+128
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved timeago performance Closes #25728 See merge request !8231
| * | | Improved timeago performancetimeago-perfPhil Hughes2017-02-073-101/+128
| | |/ | |/| | | | | | | | | | | | | | | | - Changes to use a single instance of timeago - Uses one timeout for every element, rather than 1 per element Closes #25728
* | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-0717-53/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Makes stop button visible in environment page Closes #24147 See merge request !7379
| * | | Fix stop action24147-delete-env-buttonKamil Trzcinski2017-02-071-13/+3
| | | |
| * | | Fix stoppable?Kamil Trzcinski2017-02-079-18/+18
| | | |
| * | | Update changesKamil Trzcinski2017-02-0610-35/+47
| | | |
| * | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-061340-7584/+19524
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-243559-44580/+125017
| |\ \ \ \
| * | | | | Fix rubocop errorFilipa Lacerda2016-11-111-1/+1
| | | | | |
| * | | | | Adds missing new line at the end of the fileFilipa Lacerda2016-11-101-1/+1
| | | | | |
| * | | | | Adds testsFilipa Lacerda2016-11-103-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Adds changelog entry in the correct place
| * | | | | Allow to stop any environmentKamil Trzcinski2016-11-108-21/+66
| | | | | |
| * | | | | Adds CHANGELOG entryFilipa Lacerda2016-11-091-0/+1
| | | | | |
| * | | | | Makes stop button visible in environment pageFilipa Lacerda2016-11-091-1/+1
| | | | | |
* | | | | | Merge branch 'refresh-permissions-when-moving-projects' into 'master' Rémy Coutable2017-02-077-3/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh authorizations when transferring projects See merge request !9029
| * | | | | | Refresh authorizations when transferring projectsrefresh-permissions-when-moving-projectsYorick Peterse2017-02-077-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that project authorizations are refreshed when moving a project from one namespace to another. When doing so the permissions for all users of both the old and new namespaces are refreshed. See #26194 for more information.
* | | | | | | Merge branch '27564-shave-dropdown-label-search-spec-duration' into 'master' Robert Speicher2017-02-072-100/+119
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "spec/features/issues/filtered_search/dropdown_label_spec.rb takes 10 minutes to run" Closes #27564 See merge request !8929
| * | | | | | | Shave spec/features/issues/filtered_search/dropdown_label_spec.rb from 10 ↵27564-shave-dropdown-label-search-spec-durationRémy Coutable2017-02-032-100/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minutes to 1.5 minutes - Don't use `sleep` (most of the time was wasted by that) - Expect some elements to be visible instead: capybara is smart enough to retry a few times if it cannot find an element - See https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends - Don't create unneccessary DB records - Group some examples together to shave some setup time (where it makes sense) Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'jej-fix-backup-rake-color' into 'master'Sean McGivern2017-02-071-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed backup.rake colorize method following Pages -> CE See merge request !9031
| * | | | | | | | Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-colorConnor Shea2017-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked 'Remove colorize methods that weren't in CE.'
* | | | | | | | | Merge branch '8082-permalink-to-file' into 'master' Alfredo Sumaran2017-02-077-32/+87
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add keyboard shortcut to move to file permalink `y` Closes #8082 See merge request !8799
| * | | | | | | | Add keyboard shortcut to move to file permalink8082-permalink-to-fileEric Eastwood2017-02-067-32/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/8082
* | | | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-0720-32/+400
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * | | | | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-0720-32/+400
| | | | | | | | | |
* | | | | | | | | | Merge branch 'remove-deploy-key-endpoint' into 'master' Rémy Coutable2017-02-076-89/+383
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deploy key endpoint Closes #20569 See merge request !8716
| * | | | | | | | | | Remove /projects/:id/keys/.. endpointsRobert Schilling2017-02-076-89/+383
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '27632_fix_mr_widget_url' into 'master'Sean McGivern2017-02-073-6/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget url Closes #27632 See merge request !8989
| * | | | | | | | | | Fix MR widget urlJarka Kadlecova2017-02-073-6/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in init.d/gitlab after Pages -> CE Closes #27785 See merge request !9026
| * | | | | | | | | | | Fix syntax error in init.d/gitlab after Pages -> CEDrew Blessing2017-02-071-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | Cherry-picked ‘Fix syntax error in conditional statement’
* | | | | | | | | | | Merge branch 'update-gitignore-templates' into 'master' James Lopez2017-02-0724-179/+141
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update .gitignore templates See merge request !9015
| * | | | | | | | | | | Update .gitignore templatesupdate-gitignore-templatesRuben Davila2017-02-0724-179/+141
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update-guides' into 'master' James Lopez2017-02-072-2/+241
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update guides for 8.17 version See merge request !9014
| * | | | | | | | | | | Update guides for 8.17 versionupdate-guidesRuben Davila2017-02-062-2/+241
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'api-remove-snippets-expires-at' into 'master'Sean McGivern2017-02-0712-88/+416
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723
| * | | | | | | | | | Split V3 entities into a separate fileapi-remove-snippets-expires-atRobert Schilling2017-02-076-93/+95
| | | | | | | | | | |
| * | | | | | | | | | Remove deprecated 'expires_at' from project snippets APIRobert Schilling2017-02-078-17/+343
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-0710-13/+124
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing group members from Import/Export Closes #25124 See merge request !8923
| * | | | | | | | | | | Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-0710-13/+124
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/fix-broken-links' into 'master' Achilleas Pipinellis2017-02-0746-65/+60
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken links to docs See merge request !9022
| * | | | | | | | | | | Fix broken links to docsAchilleas Pipinellis2017-02-0646-65/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'fix/grape-routes' into 'master' James Lopez2017-02-071-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Grape routes to work with current version of Grape See merge request !8992
| * | | | | | | | | | | | added missed commit in rebaseJames Lopez2017-02-071-3/+1
| | | | | | | | | | | | |