summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Properly highlight right side of parallel difffix-diff-commentsDouwe Maan2016-01-221-1/+3
|
* Restore diff commentsDouwe Maan2016-01-222-5/+7
|
* Merge branch 'drag-drop-cursor' into 'master' Jacob Schatz2016-01-211-0/+11
|\ | | | | | | | | | | | | | | | | | | | | Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
| * Milestone drag & drop cursorPhil Hughes2016-01-211-0/+11
| | | | | | | | Fixes #4097
* | Merge branch 'ci/build-artifacts-documentation' into 'master' Achilleas Pipinellis2016-01-215-0/+175
|\ \ | | | | | | | | | | | | | | | | | | Add basic documentation for build artifacts /cc @axil @ayufan See merge request !2511
| * | Refactor build artifacts documentationci/build-artifacts-documentationAchilleas Pipinellis2016-01-216-52/+175
| | | | | | | | | | | | [ci skip]
| * | Add basic documentation for build artifactsGrzegorz Bizon2016-01-203-0/+52
| | |
* | | Merge branch 'doc_restart_gitlab' into 'master' Achilleas Pipinellis2016-01-213-0/+164
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on restarting GitLab This will save as time from writing the same commands over and over again. See merge request !2510
| * | | Fix typos, make things more clearAchilleas Pipinellis2016-01-211-18/+25
| | | | | | | | | | | | | | | | [ci skip]
| * | | Link to restart_gitlab.md and some more fixesdoc_restart_gitlabAchilleas Pipinellis2016-01-201-3/+10
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add document on restarting GitLabAchilleas Pipinellis2016-01-203-0/+150
| |/ / | | | | | | | | | [ci skip]
* | | Merge branch 'fix/artifacts-download-progress-bar' into 'master' Grzegorz Bizon2016-01-213-10/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531
| * | | Move build artifacts javascripts into separate filefix/artifacts-download-progress-barGrzegorz Bizon2016-01-213-13/+16
| | | |
| * | | Do not use progress bar when downloading build artifactsGrzegorz Bizon2016-01-211-1/+5
| | | | | | | | | | | | | | | | Closes #12491
* | | | Merge branch 'fix-permissions' into 'master' Robert Speicher2016-01-2126-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove execution permissions from font assets [ci skip] See merge request !2082
| * | | | remove execution permissions from fontsPirate Praveen2016-01-2125-0/+0
| | | | |
| * | | | add execution permission for scriptPirate Praveen2016-01-211-0/+0
| |/ / /
* | | | Merge branch 'workhorse-path' into 'master' Robert Speicher2016-01-214-9/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init script changes for gitlab-workhorse in 8.4 Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31 Also bumps gitlab-workhorse to 0.6.1. [ci skip] See merge request !2529
| * | | | Use gitlab-workhorse 0.6.1workhorse-pathJacob Vosmaer2016-01-212-2/+2
| | | | |
| * | | | Mention init script updateJacob Vosmaer2016-01-211-4/+1
| | | | |
| * | | | Init script changes for gitlab-workhorse in 8.4Jacob Vosmaer2016-01-212-3/+9
| | | | |
* | | | | Merge branch 'fix-github-wiki-import' into 'master' Douwe Maan2016-01-211-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix import of GitHub's wiki when the repository has not been created Fixes #12503 See merge request !2533
| * | | | Fix import of GitHub's wiki when the repository has not been createdDouglas Barbosa Alexandre2016-01-211-2/+6
|/ / / /
* | | | Merge branch 'instrument-gitlab-git-repository' into 'master' Douwe Maan2016-01-211-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Gitlab::Git::Repository See merge request !2528
| * | | | Instrument Gitlab::Git::RepositoryYorick Peterse2016-01-211-0/+1
| | |/ / | |/| | | | | | | | | | | | | | This adds instrumentation for the instance methods of Gitlab::Git::Repository.
* | | | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-214-8/+86
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the caching The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need: 1. Cache per-build for all branches: ``` cache: key: "$CI_BUILD_NAME" untracked: true ``` 2. Cache per-branch for all jobs: ``` cache: key: "$CI_BUILD_REF" untracked: true ``` /cc @DouweM @grzesiek @axil See merge request !2436
| * | | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-204-8/+86
| | | |
* | | | Merge branch 'new-pagination' into 'master' Jacob Schatz2016-01-219-53/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new UI for pagination Fixes #6063 ![Screenshot_2016-01-20_09.38.59](/uploads/f50d333bdb6cb9683848fb0a874241ef/Screenshot_2016-01-20_09.38.59.png) See merge request !2517
| * | | | Removes 100% width because it is a block element.Jacob Schatz2016-01-201-1/+0
| | | | |
| * | | | Implement new UI for paginationDmitriy Zaporozhets2016-01-209-53/+33
|/ / / /
* | | | Merge branch 'ui-is-broken-in-search-result-page' into 'master' Dmitriy Zaporozhets2016-01-211-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix term height so text overflap does not happen. Fixes #12449 Height was set on the `.term`. It made the text overlap. See merge request !2518
| * | | | Fix term height so text overflap does not happen.ui-is-broken-in-search-result-pageJacob Schatz2016-01-201-4/+0
| | | | |
* | | | | Merge branch 'fix-project-creation' into 'master' Robert Speicher2016-01-202-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator should be added as a master of the project on creation Fixes #4222 This also enable a project creator to add themselves as a master of the project for existing repositories that were created in the meanwhile that they don't appear as members. See merge request !2520
| * | | | | Creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-202-2/+7
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | This also enable a project creator to add themselves as a master of the project.
* | | | | Remove Performance Monitoring from Integration docsRobert Speicher2016-01-201-1/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Update CHANGELOGRobert Speicher2016-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch ↵Dmitriy Zaporozhets2016-01-202-0/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' Adds disabled comment field and disabled avatar. Fixes #3540 ![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png) See merge request !2508
| * | | | | Uses color variables instead.show-message-to-signed-out-users-to-sign-in-if-they-want-to-commentJacob Schatz2016-01-201-3/+3
| | | | | |
| * | | | | Adds disabled comment field and disabled avatar.Jacob Schatz2016-01-202-0/+46
| | |_|_|/ | |/| | |
* | | | | Merge branch 'metrics-documentation' into 'master' Achilleas Pipinellis2016-01-207-0/+384
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation for GitLab Metrics This adds documentation for the metrics code I recently added. Two notes: * I'm referring to this feature as "GitLab Metrics" everywhere simply because the code resides in the `Gitlab::Metrics` namespace. A different name is fine, though I think just "Metrics" might be a bit too abstract. * Grafana isn't covered since it's fairly straight-forward to setup (there's nothing really special we can cover). I think we _should_ cover it once we start shipping it with Omnibus. I assigned @axil since he's our technical writer/documentation guru, feel free to re-assign if needed. cc @sytses @axil @dzaporozhets @JobV See merge request !2484
| * | | | | Change InfluxDB admin usernameAchilleas Pipinellis2016-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Move integration/metrics to monitoring/performanceAchilleas Pipinellis2016-01-206-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Renamed "Metrics" to "Performance Monitoring"metrics-documentationYorick Peterse2016-01-206-12/+12
| | | | | |
| * | | | | Refactor GitLab Metrics docsAchilleas Pipinellis2016-01-199-146/+285
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Added documentation for GitLab MetricsYorick Peterse2016-01-185-0/+245
| | | | | |
* | | | | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-202-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross projects detection when importing GitHub pull requests Fixes #12456 See merge request !2523
| * | | | | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-202-10/+23
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'issue_3945' into 'master' Robert Speicher2016-01-2049-392/+1151
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add syntax highlighting to diff view Closes #3945 See merge request !2109
| * \ \ \ \ \ Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-2010-0/+241
| |\ \ \ \ \ \
| * | | | | | | Use a MR with commits.Rubén Dávila2016-01-201-1/+1
| | | | | | | |