summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unneccessary importsremove-css-importsAnnabel Dunstone Gray2018-05-162-4/+0
|
* Merge branch 'fix/contributors-graph-width' into 'master'Mike Greiling2018-05-162-18/+41
|\ | | | | | | | | | | | | Fix contributors graph width Closes #22647 See merge request gitlab-org/gitlab-ce!18639
| * Use correct base widthPaul Vorbach2018-05-151-8/+22
| |
| * Refactor duplicate codePaul Vorbach2018-05-151-6/+10
| |
| * Add changelog entry for contrib graphs width fixPaul Vorbach2018-05-151-0/+5
| |
| * Use ES6 `const` more consistentlyPaul Vorbach2018-05-151-9/+6
| |
| * Fix width of contributors graphsPaul Vorbach2018-05-151-3/+6
| | | | | | | | | | | | | | The contributors graphs were sized with the full .content width in mind, but at some point GitLab changed to a more narrow design, so graphs would be too wide for their container divs. This change resizes contributors graphs relative to their correct container widths.
* | Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-165-10/+127
|\ \ | | | | | | | | | | | | | | | | | | Fix Error 500 viewing admin page due to statement timeouts Closes #46255 See merge request gitlab-org/gitlab-ce!18982
| * | Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-165-10/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | Uses PostgreSQL tuple estimates to provide a much faster yet approximate count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details. We only use this fast method if the table has been analyzed or vacuumed within the last hour. Closes #46255
* | | Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'Clement Ho2018-05-163-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fixed copy to cliboard button in embedded snippets Closes #46303 See merge request gitlab-org/gitlab-ce!18923
| * | | fixed copy to cliboard button in embedded snippetshaseeb2018-05-163-2/+8
|/ / /
* | | Merge branch 'osw-fix-boards-list-header-color' into 'master'Robert Speicher2018-05-163-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adjust board lists header text color Closes #36983 See merge request gitlab-org/gitlab-ce!18955
| * | | Adjust board lists header text colorosw-fix-boards-list-header-colorOswaldo Ferreira2018-05-143-2/+5
| | | | | | | | | | | | | | | | Adjusts regression fixed by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18786/. We were not returning the label text color correctly on the backend.
* | | | Merge branch 'dz-fix-cluster-error-message' into 'master'Annabel Gray2018-05-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove table-section from div holding cluster error messages See merge request gitlab-org/gitlab-ce!18971
| * | | | Remove unnecessary section-100 css class from application_row.vueDmitriy Zaporozhets2018-05-161-1/+1
| | | | |
| * | | | Remote table-section from div holding cluster error messagesDmitriy Zaporozhets2018-05-151-1/+1
| | | | |
* | | | | Merge branch 'update-license' into 'master'Rémy Coutable2018-05-162-6/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | edit GitLab license info in regards to CC licensing See merge request gitlab-org/gitlab-ce!18981
| * | | | | edit GitLab license info in regards to CC licensingAndrea Kao2018-05-152-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub uses a library called Licensee to identify a project's license type. It shows this information in the status bar and via the API if it can unambiguously identify the license. This commit moves the reference to Creative Commons licensing from the LICENSE file to the README, which allows Licensee to successfully identify the license type of GitLab CE as MIT. Signed-off-by: Andrea Kao <eirinikos@gmail.com>
* | | | | | Merge branch 'move-disussion-actions-to-the-right' into 'master'Tim Zallmann2018-05-165-30/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move discussion and notes actions to the right Closes #33645 See merge request gitlab-org/gitlab-ce!18476
| * | | | | | Reorder discussion timestamp information for issuesGeorge Tsiolis2018-05-043-7/+7
| | | | | | |
| * | | | | | Move note actions to the rightGeorge Tsiolis2018-05-011-4/+0
| | | | | | |
| * | | | | | Move discussion actions to the right for small viewportsGeorge Tsiolis2018-05-013-20/+20
| | | | | | |
* | | | | | | Merge branch 'fix-metrics-doorkeeper' into 'master'Nick Thomas2018-05-162-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab Performance Monitoring content types for Doorkeeper Closes #46412 See merge request gitlab-org/gitlab-ce!18984
| * | | | | | | Fix GPM content types for DoorkeeperYorick Peterse2018-05-162-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain controllers (e.g. Doorkeeper::TokensController) don't expose the method "request_format". This commit changes Gitlab::Metrics::WebTransaction so we don't rely on this method, instead using the underlying code this method uses. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/46412
* | | | | | | | Merge branch '43673-operations-tab-mvc' into 'master'Filipa Lacerda2018-05-165-72/+229
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project Sidebar: Split CI/CD into CI/CD and Operations Closes #43673 See merge request gitlab-org/gitlab-ce!18941
| * | | | | | | | Project Sidebar: Split CI/CD into CI/CD and OperationsLukas Eipert2018-05-165-72/+229
|/ / / / / / / /
* | | | | | | | Merge branch 'zj-add-branch-mandatory' into 'master'Douwe Maan2018-05-163-77/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Gitlab::Git::Repository#add_branch to mandatory Closes gitaly#540 See merge request gitlab-org/gitlab-ce!18939
| * | | | | | | Move Gitlab::Git::Repository#add_branch to mandatoryZeger-Jan van de Weg2018-05-143-77/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, a feature flag could be used to disable this feature. Now all requests go through Gitaly's OperationService. Closes https://gitlab.com/gitlab-org/gitaly/issues/540 When vendoring `Gitlab::Git` again in Gitaly, this implemenation will be gone, but this is readded there through: https://gitlab.com/gitlab-org/gitaly/merge_requests/717
* | | | | | | | Merge branch 'registry-ux-improvements-remove-clipboard-prefix' into 'master'Filipa Lacerda2018-05-163-11/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove docker pull prefix from registry clipboard feature Closes #46314 and #45968 See merge request gitlab-org/gitlab-ce!18933
| * | | | | | | | Remove docker pull prefix from registry clipboard featureLars Greiss2018-05-163-11/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-fe-vuex-updates' into 'master'Filipa Lacerda2018-05-161-12/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs fe vuex updates See merge request gitlab-org/gitlab-ce!18826
| * | | | | | | | code example formattingDennis Tang2018-05-141-2/+2
| | | | | | | | |
| * | | | | | | | more typosDennis Tang2018-05-141-4/+4
| | | | | | | | |
| * | | | | | | | typo in `endpoint`Dennis Tang2018-05-141-2/+2
| | | | | | | | |
| * | | | | | | | clarify that the function export should be defaultDennis Tang2018-05-141-1/+1
| | | | | | | | |
| * | | | | | | | fix typoDennis Tang2018-05-111-1/+1
| | | | | | | | |
| * | | | | | | | add link for babel-plugin-rewireDennis Tang2018-05-081-1/+1
| | | | | | | | |
| * | | | | | | | Update vuex.mdDennis Tang2018-05-081-1/+1
| | | | | | | | |
| * | | | | | | | add rewire gotcha about testing vuex actions/gettersDennis Tang2018-05-081-0/+12
| | | | | | | | |
| * | | | | | | | correct doc-nav header hierarchy Dennis Tang2018-05-081-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/shared-runners-timeout' into 'master'Rémy Coutable2018-05-161-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the 3h timeout for GitLab.com shared Runners See merge request gitlab-org/gitlab-ce!18983
| * | | | | | | | | Document the 3h timeout for GitLab.com shared RunnersAchilleas Pipinellis2018-05-161-1/+6
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'docs-41873-bulk-edit-issuable' into 'master'Achilleas Pipinellis2018-05-163-0/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for bulk editing of issues and merge requests Closes #41873 See merge request gitlab-org/gitlab-ce!16614
| * | | | | | | | Add documentation for bulk editing of issues and merge requestsMark Fletcher2018-05-153-0/+25
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-ref-contains-sha-mandatory' into 'master'Robert Speicher2018-05-163-58/+18
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref contains oid check done by Gitaly Closes gitaly#884 See merge request gitlab-org/gitlab-ce!18944
| * | | | | | | | Ref contains oid check done by GitalyZeger-Jan van de Weg2018-05-143-58/+18
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two endpoints are in opt-out, and no one noticed. Has been running on .com for 4 months now and considered stable. Closes https://gitlab.com/gitlab-org/gitaly/issues/884
* | | | | | | | Merge branch '43367/fix-board-long-strings' into 'master'Annabel Gray2018-05-153-3/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug with long strings in issue boards Closes #43367 See merge request gitlab-org/gitlab-ce!18924
| * | | | | | | Fix bug with long strings in issue boardsPaul Slaughter2018-05-153-3/+22
|/ / / / / / /
* | | | | | | Merge branch 'fix-metrics-content-types' into 'master'Stan Hu2018-05-153-16/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting Gitlab metrics content types Closes gitlab-com/infrastructure#3499 See merge request gitlab-org/gitlab-ce!18975
| * | | | | | | Fix setting Gitlab metrics content typesYorick Peterse2018-05-153-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method "content_type" on a controller does not always return the correct content type. On the other hand, the method "request_format" does _and_ immediately returns a Symbol (e.g. :json) instead of a mime-type name (e.g. application/json). With these changes metrics should again report their action names correctly. Fixes https://gitlab.com/gitlab-com/infrastructure/issues/3499
View Lorry Controller Status