summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
* Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-2510-39/+94
|\
| * Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-1910-39/+94
* | Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-254-18/+68
|\ \
| * | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-244-18/+68
| |/
* | Merge branch '35199-case-insensitive-branches-search' into 'master'Sean McGivern2017-10-253-1/+15
|\ \
| * | Add case insensitive branches searchGeorge Andrinopoulos2017-10-233-1/+15
* | | Merge branch '39419-remove-overzealous-tooltips-in-projects-page-tabs' into '...Sean McGivern2017-10-252-3/+8
|\ \ \
| * | | Resolve "Remove overzealous tooltips in projects page tabs"Victor Wu2017-10-252-3/+8
|/ / /
* | | Merge branch '32318-filter-icon' into 'master'Phil Hughes2017-10-253-13/+6
|\ \ \
| * | | Remove filter icon from search bar32318-filter-iconAnnabel Dunstone Gray2017-10-243-13/+6
|/ / /
* | | Merge branch 'jramsay-remove-superfluous-namespace' into 'master'Douwe Maan2017-10-242-11/+68
|\ \ \
| * | | Remove superfluous namespace from cluster settingsjramsay-remove-superfluous-namespaceJames Ramsay2017-10-222-11/+68
* | | | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-248-37/+34
|\ \ \ \
| * | | | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-238-37/+34
* | | | | Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-10-242-11/+5
|\ \ \ \ \
| * | | | | Don't rename groups/projects that aren't reserved anymorebvl-dont-rename-free-namesBob Van Landuyt2017-10-242-11/+5
* | | | | | Merge branch 'sh-memoize-logger' into 'master'Nick Thomas2017-10-243-2/+27
|\ \ \ \ \ \
| * | | | | | Memoize GitLab logger to reduce open file descriptorsStan Hu2017-10-243-2/+27
* | | | | | | Merge branch 'suggest-rename-origin' into 'master'Sean McGivern2017-10-242-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entryHerman van Rink2017-10-201-0/+5
| * | | | | | | Suggest to rename the remote for existing repositoriesHerman van Rink2017-10-201-0/+1
* | | | | | | | Merge branch 'api-doc-group-statistics' into 'master'Achilleas Pipinellis2017-10-242-0/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Update groups API documentationRobert Schilling2017-10-242-0/+37
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-243-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the writing of invalid environment refssh-fix-environment-write-refStan Hu2017-10-233-1/+16
* | | | | | | | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-2410-4/+782
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| * | | | | | | | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
| * | | | | | | | | Add pages domains API testsTravis Miller2017-10-221-0/+440
| * | | | | | | | | Add pages domains API schemaTravis Miller2017-10-221-0/+23
| * | | | | | | | | Add pages domains API documentationTravis Miller2017-10-222-0/+171
| * | | | | | | | | Rename conflicting private method in PagesDomain modelTravis Miller2017-10-221-4/+4
| * | | | | | | | | Add ChangelogTravis Miller2017-10-221-0/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-2419-196/+275
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-233-3/+32
| * | | | | | | | | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-234-4/+39
| * | | | | | | | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-237-190/+128
| * | | | | | | | | Allow configuring new circuitbreaker settings from the UI and APIBob Van Landuyt2017-10-237-11/+64
| * | | | | | | | | Add new circuitbreaker properties to application_settingsBob Van Landuyt2017-10-233-1/+25
* | | | | | | | | | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-2425-52/+708
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-2317-12/+520
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | spec fixesPhil Hughes2017-10-234-139/+146
| * | | | | | | | | | | moved to eventHub to manage creating new filesPhil Hughes2017-10-237-50/+71
| * | | | | | | | | | | fixed eslint :see_no_evil:Phil Hughes2017-10-231-3/+1
| * | | | | | | | | | | added feature specPhil Hughes2017-10-235-4/+107
| * | | | | | | | | | | fixed failing title testPhil Hughes2017-10-232-0/+2
| * | | | | | | | | | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-237-13/+54
| * | | | | | | | | | | failing spec fixesPhil Hughes2017-10-236-47/+42
| * | | | | | | | | | | correctly creates file in currently viewed directoryPhil Hughes2017-10-237-4/+250