summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Introduce #find_sidebar and use a constant to find the page14995-custom_wiki_sidebarLin Jen-Shin2018-03-263-1/+24
* Add some simple docs about _sidebar for wikiLin Jen-Shin2018-03-261-0/+7
* Rearrange the tests and add another case whereLin Jen-Shin2018-03-261-15/+27
* Avoid loading default sidebar if there's a customized oneLin Jen-Shin2018-03-261-2/+5
* Add test for sidebar and cleanup wiki testsLin Jen-Shin2018-03-231-3/+38
* Added support for custom wiki sidebar using _sidebar.md in the wiki root. If ...Joshua Sooter2018-03-233-5/+15
* Merge branch 'bw-tweak-migration-style-guide-docs' into 'master'Robert Speicher2018-03-221-4/+12
|\
| * make a little more obvious what operations might need downtime or enhanced mi...Brett Walker2018-03-221-4/+12
|/
* Merge branch '44386-better-ux-for-long-name-branches' into 'master'Phil Hughes2018-03-223-72/+95
|\
| * UX re-design branch items with flexboxTakuya Noguchi2018-03-223-72/+95
* | Merge branch 'backport-4006-add-weight-indicator-to-issues-board' into 'master'Clement Ho2018-03-221-2/+2
|\ \
| * | backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-boardDennis Tang2018-03-211-2/+2
* | | Merge branch 'leipert-42037-long-instance-names-group-names-covers-namespace-...Clement Ho2018-03-224-25/+40
|\ \ \
| * | | Prevent overflow of long instance urls during Project creationLukas Eipert2018-03-224-25/+40
|/ / /
* | | Merge branch 'latest-security-to-master-21-03-18' into 'master'Douwe Maan2018-03-2248-135/+543
|\ \ \
| * \ \ Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-22219-1250/+2797
| |\ \ \
| * | | | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18Francisco Javier López2018-03-211-1/+1
| * | | | Adapting mattermost to the new way of calling HTTPFrancisco Javier López2018-03-211-1/+1
| * | | | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-219-55/+134
| * | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-2139-79/+408
* | | | | Merge branch '44453-performance-bar-modalbox' into 'master'Phil Hughes2018-03-223-2/+13
|\ \ \ \ \
| * | | | | Fix class nameFilipa Lacerda2018-03-221-1/+1
| * | | | | Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-22217-1250/+2795
| |\ \ \ \ \
| * | | | | | Prevent column with smaller width in performance barFilipa Lacerda2018-03-211-2/+1
| * | | | | | Merge branch 'master' into 44453-performance-bar-modalboxFilipa Lacerda2018-03-21155-331/+9448
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Adds a bigger width to the performance bar modal box and breaks the contentFilipa Lacerda2018-03-203-2/+14
* | | | | | | Merge branch 'docs/cache-clear-image' into 'master'Marcia Ramos2018-03-222-8/+10
|\ \ \ \ \ \ \
| * | | | | | | Add image for clearing the cache docsAchilleas Pipinellis2018-03-222-8/+10
* | | | | | | | Merge branch 'fix/remove-wiki-cache-clear' into 'master'Sean McGivern2018-03-221-3/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clearAhmad Sherif2018-03-211-3/+0
* | | | | | | | Merge branch 'ce-version-of-ee-4295' into 'master'Achilleas Pipinellis2018-03-221-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix CI Jobs retry linkGeorge Tsiolis2018-03-211-2/+2
* | | | | | | | Merge branch '37987-speed-up-pipeline-creation' into 'master'Kamil Trzciński2018-03-222-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add inverse_of: :pipeline for pipeline.builds (#37987)37987-speed-up-pipeline-creationDylan Griffith2018-03-212-1/+3
* | | | | | | | Merge branch 'move-email-footer-info-to-single-line' into 'master'Filipa Lacerda2018-03-222-7/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Move email footer info to a single linemove-email-footer-info-to-single-lineEric Eastwood2018-03-212-7/+8
* | | | | | | | | Merge branch 'performance-bar-position-fix' into 'master'Filipa Lacerda2018-03-228-59/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed karmaperformance-bar-position-fixPhil Hughes2018-03-211-10/+2
| * | | | | | | | | removed check for hostPhil Hughes2018-03-214-35/+27
| * | | | | | | | | Fix performance bar spacingPhil Hughes2018-03-215-16/+34
* | | | | | | | | | Merge branch 'sh-fix-readonly-reload' into 'master'Sean McGivern2018-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ...Stan Hu2018-03-211-1/+1
* | | | | | | | | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-223-45/+141
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | OmniauthInitializer refactoringjej/omniauth-initializer-refactorJames Edwards-Jones2018-03-221-33/+31
| * | | | | | | | | | | Omniauth callbacks moved to methodsJames Edwards-Jones2018-03-201-26/+38
| * | | | | | | | | | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-203-45/+131
* | | | | | | | | | | | Update VERSION to 10.7.0-prev10.7.0.preJames Lopez2018-03-221-1/+1
* | | | | | | | | | | | Update CHANGELOG.md for 10.6.0James Lopez2018-03-22151-749/+184
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-223-6/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-213-6/+35