summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add new image now that the plus button is brought backwabernat1/gitlab-ce-patch-14Achilleas Pipinellis2017-04-272-14/+16
|
* Update create-project.md (comprehensive changes)William Abernathy2017-04-271-16/+18
|
* Merge branch 'patch-21' into 'master' Achilleas Pipinellis2017-04-271-1/+2
|\ | | | | | | | | clarify when GitLab pages requires special config for load balancer See merge request !10954
| * special pages config only needed for custom domain supportBen Bodenmiller2017-04-271-1/+2
|/
* Merge branch 'backport-cyclomatic_complexity-fix' into 'master' Douwe Maan2017-04-261-18/+26
|\ | | | | | | | | Fix Rubocop CyclomaticComplexity offense See merge request !10941
| * Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fixRémy Coutable2017-04-261-18/+26
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '30466-click-x-to-remove-filter' into 'master' Jacob Schatz2017-04-268-21/+145
|\ \ | | | | | | | | | | | | | | | | | | Add button to delete filters from filtered search bar Closes #30466 See merge request !10795
| * | Add button to delete filters from filtered search barClement Ho2017-04-268-21/+145
|/ /
* | Merge branch '31458-fix-rubocop-failure' into 'master' Rémy Coutable2017-04-261-17/+21
|\ \ | | | | | | | | | | | | | | | | | | Fix a failing Rubocop rule on master Closes #31458 See merge request !10947
| * | Fix a failing Rubocop rule on masterDouglas Barbosa Alexandre2017-04-261-17/+21
| | |
* | | Merge branch 'gl-version-backup-file' into 'master' Rémy Coutable2017-04-264-116/+146
|\ \ \ | | | | | | | | | | | | | | | | Add GitLab version to backup file name See merge request !10901
| * | | Fix failing specgl-version-backup-fileAchilleas Pipinellis2017-04-261-1/+1
| | | | | | | | | | | | | | | | http://rubular.com/r/op7TI9UX6K
| * | | Refactor backup/restore docsAchilleas Pipinellis2017-04-252-114/+144
| | | |
| * | | Expose GitLab version in backup fileAchilleas Pipinellis2017-04-251-1/+1
| | | | | | | | | | | | | | | | Instead of doing hacks like http://stackoverflow.com/a/26082612/974710
* | | | Merge branch 'dm-sidekiq-5' into 'master' Stan Hu2017-04-263-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump Sidekiq to 5.0.0 See merge request !10943
| * | | | Bump Sidekiq to 5.0.0dm-sidekiq-5Douwe Maan2017-04-263-5/+9
| | | | |
* | | | | Merge branch 'opt-out-not-in' into 'master' Sean McGivern2017-04-261-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | correct documentation on opt-out-ness of usage ping See merge request !10945
| * | | | correct documentation on opt-out-ness of usage pingopt-out-not-inJob van der Voort2017-04-261-1/+1
| |/ / /
* | | | Merge branch '31335-job-dropdown' into 'master' Phil Hughes2017-04-265-64/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Jobs dropdown in mini graph should close when we receive an error" Closes #31335 See merge request !10887
| * | | | Resolve "Jobs dropdown in mini graph should close when we receive an error"Filipa Lacerda2017-04-265-64/+114
|/ / / /
* | | | Merge branch 'zj-dockerfiles' into 'master' Douwe Maan2017-04-2610-4/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Submodule Dockerfile templates See merge request !10663
| * | | | Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-2610-4/+70
|/ / / /
* | | | Merge branch 'replace_header_mr_icon' into 'master' Filipa Lacerda2017-04-262-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Replace header merge request icon Closes #31088 See merge request !10932
| * | | Replace header merge request iconblackst0ne2017-04-262-1/+6
| | | |
* | | | Merge branch 'zj-rspec-set' into 'master' Rémy Coutable2017-04-266-34/+58
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Use rspec-set to speed up examples See merge request !10551
| * | | Use rspec-set to speed up examplesZeger-Jan van de Weg2017-04-266-34/+58
|/ / /
* | | Merge branch 'backport-md-cache-fix' into 'master' Dmitriy Zaporozhets2017-04-262-3/+5
|\ \ \ | | | | | | | | | | | | | | | | Work around a hard-to-understand failure in `CacheMarkdownField` See merge request !10918
| * | | Fix a failing specNick Thomas2017-04-251-2/+2
| | | |
| * | | Swap a before_save call with a before_create/before_update pair to avoid a ↵Nick Thomas2017-04-251-1/+3
| | | | | | | | | | | | | | | | confict with elasticsearch-model
* | | | Merge branch '26509-show-update-time' into 'master' Annabel Dunstone Gray2017-04-265-17/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add updated time to project list Closes #26509 See merge request !8514
| * | | | Add updated time to project listJeff Stubler2017-04-215-17/+26
| | | | |
* | | | | Merge branch 'docs-reorg-landing-page' into 'master' Achilleas Pipinellis2017-04-263-95/+214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorg CE Docs landing page Closes #31069 See merge request !10754
| * | | | | Reorg CE Docs landing pageMarcia Ramos2017-04-263-95/+214
| | | | | |
* | | | | | Merge branch ↵Clement Ho2017-04-265-10/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master' [#22826] Ensure find_file_link and download button is part of file tree header Closes #22826 See merge request !9847
| * | | | | [#22826] Add newline before expect in accordance to four phase thoughtbot styleTM Lee2017-04-251-0/+2
| | | | | |
| * | | | | [#22826] Ensure find_file_link and download button is part of file tree headerTM Lee2017-04-235-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the find_file_link and download partial into the project tree_header partial - Added Changelog
* | | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-2610-29/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support preview_markdown action for personal_snippets See merge request !10810
| * | | | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-2610-29/+80
| | | | | | |
* | | | | | | Merge branch '27376-bvl-load-pipelinestatus-in-batch' into 'master' Rémy Coutable2017-04-268-30/+204
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load a project's CI status in batch from redis Closes #27376 See merge request !10785
| * | | | | | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-268-30/+204
|/ / / / / / /
* | | | | | | Update CHANGELOG.md for 9.1.1Lin Jen-Shin2017-04-2612-45/+15
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '31439-fix-transient-spinach-failures' into 'master' Sean McGivern2017-04-261-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for AJAX after steps defined in SharedActiveTab Closes #31439 See merge request !10935
| * | | | | | | Wait for AJAX after steps defined in SharedActiveTab31439-fix-transient-spinach-failuresRémy Coutable2017-04-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '26437-closed-by' into 'master' Rémy Coutable2017-04-266-1/+122
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issues/:iid/closed_by api endpoint Closes #26437 See merge request !10511
| * | | | | | | | Add issues/:iid/closed_by api endpointmhasbini2017-04-126-1/+122
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2622-101/+930
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring rake task to import GitHub repositories See merge request !10695
| * | | | | | | | | Add basic progress output to GitHub importDouglas Barbosa Alexandre2017-04-252-3/+12
| | | | | | | | | |
| * | | | | | | | | Fix undefined attribute params from import taskDouglas Barbosa Alexandre2017-04-251-1/+0
| | | | | | | | | |
| * | | | | | | | | Fix Rubocop offensesDouglas Barbosa Alexandre2017-04-251-2/+6
| | | | | | | | | |
| * | | | | | | | | Fix import of notes on Pull Request diffDouglas Barbosa Alexandre2017-04-253-9/+12
| | | | | | | | | |