summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'suggest-rename-origin' into 'master'Sean McGivern2017-10-242-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest to rename the remote for existing repositories See merge request gitlab-org/gitlab-ce!14970
| * | | | | | | | | | | | | | | 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 documentation Closes #38922 See merge request gitlab-org/gitlab-ce!15024
| * | | | | | | | | | | | | | | | 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 refs Closes #39182 See merge request gitlab-org/gitlab-ce!14993
| * | | | | | | | | | | | | | | | Fix the writing of invalid environment refssh-fix-environment-write-refStan Hu2017-10-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment names that contained a space would cause an error in GitLab 10.1 because a new guard clause was introduced in Repository#write_ref to prevent such references from existing. Use the slug instead to ensure that the name is valid. Closes #39182
* | | | | | | | | | | | | | | | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-2410-4/+782
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pages API" Closes #23000 See merge request gitlab-org/gitlab-ce!13917
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
| * | | | | | | | | | | | | | | | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-233-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we can enable the circuitbreaker for just one host at a time.
| * | | | | | | | | | | | | | | | | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-234-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only checking once within a timeout, check multiple times within a timeout. That means with a timeout of 30 seconds and 3 retries. Each try would be allowed 20 seconds.
| * | | | | | | | | | | | | | | | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-237-190/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The circuitbreaker now has 2 failure modes: - Backing off: This will raise the `Gitlab::Git::Storage::Failing` exception. Access to the shard is blocked temporarily. - Circuit broken: This will raise the `Gitlab::Git::Storage::CircuitBroken` exception. Access to the shard will be blocked until the failures are reset.
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new files & directories in the multi-file editor Closes #38614 See merge request gitlab-org/gitlab-ce!14839
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed an ID from the CSS
| * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clears all tmp files after cancelling edit mode
| * | | | | | | | | | | | | | | | | | | failing spec fixesPhil Hughes2017-10-236-47/+42
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | correctly creates file in currently viewed directoryPhil Hughes2017-10-237-4/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specs
| * | | | | | | | | | | | | | | | | | | changed adding temp files/directories code to match new structurePhil Hughes2017-10-232-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this uses the new data structure of adding into the different arrays which makes the code a lot easier to work with. Some changes need to be made around commiting & changing the content. [ci skip]
| * | | | | | | | | | | | | | | | | | | fixed new file/directory modal using methods that no longer existPhil Hughes2017-10-233-46/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Add new files & directories in the multi-file editorPhil Hughes2017-10-2312-32/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38614
* | | | | | | | | | | | | | | | | | | | Merge branch 'hide-pipeline-zero-duration' into 'master'Grzegorz Bizon2017-10-242-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides pipeline duration in commit box when it is zero (nil) Closes #32788 See merge request gitlab-org/gitlab-ce!14979
| * | | | | | | | | | | | | | | | | | | | Hides pipeline duration in commit box when it is zero (nil)Guilherme Vieira2017-10-202-2/+8
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-247-43/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up `new-sidebar` See merge request gitlab-org/gitlab-ce!14978
| * | | | | | | | | | | | | | | | | | | | | Rename new_sidebar in JSremove-new-sidebar-stuffAnnabel Dunstone Gray2017-10-202-5/+5
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove variables from sidebar CSSAnnabel Dunstone Gray2017-10-202-22/+20
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Replace all instances of new-sidebar with contextual-sidebarAnnabel Dunstone Gray2017-10-204-18/+14
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code review discussion action buttons Closes #38891 See merge request gitlab-org/gitlab-ce!14801
| * | | | | | | | | | | | | | | | | | | | | | Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-colorAnnabel Dunstone Gray2017-10-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sticky-perf' into 'master'Filipa Lacerda2017-10-244-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance of sticky.js Closes #39332 See merge request gitlab-org/gitlab-ce!14976
| * | | | | | | | | | | | | | | | | | | | | | | fixed karma testssticky-perfPhil Hughes2017-10-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | calculate the stickyTop instead of hard coding a variablePhil Hughes2017-10-233-4/+13
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Fix performance of sticky.jsPhil Hughes2017-10-232-7/+3
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #39332
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Sherlock usage from the performance bar Closes #39351 See merge request gitlab-org/gitlab-ce!15000
| * | | | | | | | | | | | | | | | | | | | | | Remove Sherlock usage from the performance barperformance-bar-sqlYorick Peterse2017-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sherlock::Query generates a backtrace on every call to "new", which is very slow. Formatter queries are also not displayed properly due to the lack of "white-space: pre" in the CSS. We took a look at fixing this, but the produced output is not really better than just displaying queries on one line. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39351
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 'master'Robert Schilling2017-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the smallest of typos See merge request gitlab-org/gitlab-ce!15022
| * | | | | | | | | | | | | | | | | | | | | | Changing the smallest of typosLyle Kozloff2017-10-241-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |