summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge branch 'zj-disable-timeout-migration' into 'master' Yorick Peterse2016-12-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable timeout while removing services Closes #25976 See merge request !8322
| * | | | | | | | | | | | | | | | | | Disable timeout while removing serviceszj-disable-timeout-migrationZ.J. van de Weg2016-12-271-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On GitLab.com this migration could take about 3 minutes. Disabling the statement we know we have enough time to complete this. Fixes #25976
* | | | | | | | | | | | | | | | | | Link to k8s contributing doc.Sytse Sijbrandij2016-12-272-3/+16
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch ↵Douwe Maan2016-12-275-7/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master' Resolve "Gitlab merge request view crash when commiting a js sourcemap file" Closes #25931 See merge request !8310
| * | | | | | | | | | | | | | | | | | Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-fileSean McGivern2016-12-264-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to highlight and cache files hidden by .gitattributes entries.
| * | | | | | | | | | | | | | | | | | Use raw_diffs to calculate MR files changedSean McGivern2016-12-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to create the intermediate FileCollection object with its associated highlighting in order to count how many files changed. Both the compare object and the MR diff object have a raw_diffs method that is perfectly fine for this case.
* | | | | | | | | | | | | | | | | | | Merge branch 'filename-to-file-path' into 'master' Sean McGivern2016-12-272-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename filename to file path in tooltip of file header in merge request diff See merge request !8314
| * | | | | | | | | | | | | | | | | | | Add changelogfilename-to-file-pathVictor Wu2016-12-271-0/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Rename filename to file path in tooltip of file header in merge request diffVictor Wu2016-12-261-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'auto-deploy-with-space' into 'master' Sean McGivern2016-12-2710-19/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
| * | | | | | | | | | | | | | | | | | | | Rename "autodeploy" to "auto deploy"auto-deploy-with-spaceAdam Niedzielski2016-12-2310-19/+23
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-build-failure-links' into 'master' Sean McGivern2016-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build failure links in Slack See merge request !8311
| * | | | | | | | | | | | | | | | | | | | Fix build failure links in Slackfix-build-failure-linksSean McGivern2016-12-261-1/+1
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-latest-pipeine-ordering-again' into 'master' Kamil Trzciński2016-12-263-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order only for latest_successful_for See merge request !8301
| * | | | | | | | | | | | | | | | | | | Add a test for latest_successful_forfix-latest-pipeine-ordering-againLin Jen-Shin2016-12-262-0/+17
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Order only for latest_successful_forLin Jen-Shin2016-12-261-6/+3
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286#note_20461082
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-single-team' into 'master' Kamil Trzciński2016-12-261-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix single team selection See merge request !8251
| * | | | | | | | | | | | | | | | | | | Fix single team selectionfix-single-teamKamil Trzcinski2016-12-221-1/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '26040-hide-scroll-top' into 'master' Fatih Acet2016-12-262-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide Scroll Top button for failed Build page Closes #26040 See merge request !8295
| * | | | | | | | | | | | | | | | | | | Changelog entry for MR !829526040-hide-scroll-topKushal Pandya2016-12-231-0/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Hide Scroll Top for failed buildKushal Pandya2016-12-231-2/+2
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '25909-fix-mr-list-timestamp-alignment' into 'master' Fatih Acet2016-12-262-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes timestamp text alignment in mr-list and issue-list Closes #25909 See merge request !8271
| * | | | | | | | | | | | | | | | | | | | changelog added25909-fix-mr-list-timestamp-alignmentNur Rony2016-12-231-0/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fixes timestamp text alignemnt in mr-list and issue-listNur Rony2016-12-231-1/+0
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'label-gfm-error-fix' into 'master' Fatih Acet2016-12-263-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed error with GFM autocomplete when no data exists See merge request !8288
| * | | | | | | | | | | | | | | | | | | | | Fixed error with GFM autocomplete when no data existslabel-gfm-error-fixPhil Hughes2016-12-233-2/+17
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch '26026-pipeline-overflow-firefox' into 'master' Fatih Acet2016-12-262-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line breaking in nodes of the pipeline graph in firefox Closes #26026 See merge request !8292
| * | | | | | | | | | | | | | | | | | | | | | Fix line breaking in nodes of the pipeline graph in firefox26026-pipeline-overflow-firefoxFilipa Lacerda2016-12-232-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds MR ID to CHANGELOG entry
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '26038-fix-confedential-warning-text-alignment' into 'master' Fatih Acet2016-12-262-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes confidential warning alignment on comment box Closes #26038 See merge request !8293
| * | | | | | | | | | | | | | | | | | | | | | | adds changelog26038-fix-confedential-warning-text-alignmentNur Rony2016-12-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | fixes confedential warning alignment on comment boxNur Rony2016-12-231-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 're-style-issue-new-branch' into 'master' Sean McGivern2016-12-263-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In issue view, remove checking branches state See merge request !8023
| * | | | | | | | | | | | | | | | | | | | | | | In issue view, remove checking branches and new branch unavailable statesvictorwu2016-12-263-6/+3
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '25705-your-commands-have-been-executed-is-overkill' into 'master' Sean McGivern2016-12-265-19/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace wording for slash command confirmation message See merge request !8123
| * | | | | | | | | | | | | | | | | | | | | | Replace wording for slash command confirmation messagevictorwu2016-12-265-19/+22
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ux-guide-copy-discussion' into 'master' Sean McGivern2016-12-261-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UX Guide: add comment and discussion to copy See merge request !8206
| * | | | | | | | | | | | | | | | | | | | | | [ci skip] UX Guide: add comment and discussion to copyux-guide-copy-discussionAllison Whilden2016-12-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] UX Guide: refine discussion definition
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-2650-171/+776
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more storage statistics See merge request !7754
| * | | | | | | | | | | | | | | | | | | | | | Add more storage statisticsMarkus Koller2016-12-2149-121/+748
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
| * | | | | | | | | | | | | | | | | | | | | | Remove rake task update_commit_countMarkus Koller2016-12-211-20/+0
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Remove unused ProjectsHelper#round_commit_countMarkus Koller2016-12-211-14/+0
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Consistently use current_user in API entitiesMarkus Koller2016-12-213-21/+21
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Don't expose all namespace fields in APIMarkus Koller2016-12-212-2/+14
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Update stack information and remove redundancySid Sijbrandij2016-12-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Update README.md with CI and CDSid Sijbrandij2016-12-241-1/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mrchrisw/fix-whitespace-code-block' into 'master' Achilleas Pipinellis2016-12-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix whitespace in codeblock See merge request !8291
| * | | | | | | | | | | | | | | | | | | | | | Fix whitespace in codeblock mrchrisw/fix-whitespace-code-blockChris Wilson2016-12-231-1/+0
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'revert-5c0f2541' into 'master' Grzegorz Bizon2016-12-244-13/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'" See merge request !8302
| * | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"Grzegorz Bizon2016-12-244-13/+14
|/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !8286
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-cycle-analytics-nav' into 'master' Alfredo Sumaran2016-12-241-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS fixes on Cycle Analytics page See merge request !8300