Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-permissions' into 'master' | Robert Speicher | 2016-01-21 | 26 | -0/+0 |
|\ | |||||
| * | remove execution permissions from fonts | Pirate Praveen | 2016-01-21 | 25 | -0/+0 |
| * | add execution permission for script | Pirate Praveen | 2016-01-21 | 1 | -0/+0 |
* | | Merge branch 'workhorse-path' into 'master' | Robert Speicher | 2016-01-21 | 4 | -9/+12 |
|\ \ | |||||
| * | | Use gitlab-workhorse 0.6.1workhorse-path | Jacob Vosmaer | 2016-01-21 | 2 | -2/+2 |
| * | | Mention init script update | Jacob Vosmaer | 2016-01-21 | 1 | -4/+1 |
| * | | Init script changes for gitlab-workhorse in 8.4 | Jacob Vosmaer | 2016-01-21 | 2 | -3/+9 |
* | | | Merge branch 'fix-github-wiki-import' into 'master' | Douwe Maan | 2016-01-21 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | Fix import of GitHub's wiki when the repository has not been created | Douglas Barbosa Alexandre | 2016-01-21 | 1 | -2/+6 |
|/ / / | |||||
* | | | Merge branch 'instrument-gitlab-git-repository' into 'master' | Douwe Maan | 2016-01-21 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Instrument Gitlab::Git::Repository | Yorick Peterse | 2016-01-21 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'ci/cache-key' into 'master' | Douwe Maan | 2016-01-21 | 4 | -8/+86 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-key | Kamil Trzcinski | 2016-01-20 | 4 | -8/+86 |
* | | | Merge branch 'new-pagination' into 'master' | Jacob Schatz | 2016-01-21 | 9 | -53/+32 |
|\ \ \ | |||||
| * | | | Removes 100% width because it is a block element. | Jacob Schatz | 2016-01-20 | 1 | -1/+0 |
| * | | | Implement new UI for pagination | Dmitriy Zaporozhets | 2016-01-20 | 9 | -53/+33 |
|/ / / | |||||
* | | | Merge branch 'ui-is-broken-in-search-result-page' into 'master' | Dmitriy Zaporozhets | 2016-01-21 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | Fix term height so text overflap does not happen.ui-is-broken-in-search-result-page | Jacob Schatz | 2016-01-20 | 1 | -4/+0 |
* | | | | Merge branch 'fix-project-creation' into 'master' | Robert Speicher | 2016-01-20 | 2 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | Creator should be added as a master of the project on creation | Douglas Barbosa Alexandre | 2016-01-20 | 2 | -2/+7 |
| | |_|/ | |/| | | |||||
* | | | | Remove Performance Monitoring from Integration docs | Robert Speicher | 2016-01-20 | 1 | -1/+0 |
* | | | | Update CHANGELOG | Robert Speicher | 2016-01-20 | 1 | -0/+1 |
* | | | | Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-com... | Dmitriy Zaporozhets | 2016-01-20 | 2 | -0/+46 |
|\ \ \ \ | |||||
| * | | | | Uses color variables instead.show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment | Jacob Schatz | 2016-01-20 | 1 | -3/+3 |
| * | | | | Adds disabled comment field and disabled avatar. | Jacob Schatz | 2016-01-20 | 2 | -0/+46 |
* | | | | | Merge branch 'metrics-documentation' into 'master' | Achilleas Pipinellis | 2016-01-20 | 7 | -0/+384 |
|\ \ \ \ \ | |||||
| * | | | | | Change InfluxDB admin username | Achilleas Pipinellis | 2016-01-20 | 1 | -3/+3 |
| * | | | | | Move integration/metrics to monitoring/performance | Achilleas Pipinellis | 2016-01-20 | 6 | -1/+1 |
| * | | | | | Renamed "Metrics" to "Performance Monitoring"metrics-documentation | Yorick Peterse | 2016-01-20 | 6 | -12/+12 |
| * | | | | | Refactor GitLab Metrics docs | Achilleas Pipinellis | 2016-01-19 | 9 | -146/+285 |
| * | | | | | Added documentation for GitLab Metrics | Yorick Peterse | 2016-01-18 | 5 | -0/+245 |
* | | | | | | Merge branch 'fix-github-pull-requests-import' into 'master' | Robert Speicher | 2016-01-20 | 2 | -10/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix cross projects detection when importing GitHub pull requests | Douglas Barbosa Alexandre | 2016-01-20 | 2 | -10/+23 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'issue_3945' into 'master' | Robert Speicher | 2016-01-20 | 49 | -392/+1151 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into issue_3945issue_3945 | Rubén Dávila | 2016-01-20 | 10 | -0/+241 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Use a MR with commits. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 31 | -32/+159 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Validate bounds just to be sure | Douwe Maan | 2016-01-20 | 1 | -0/+3 |
| * | | | | | | | | Properly highlight lines around '\ No newline at end of file' | Douwe Maan | 2016-01-20 | 5 | -7/+24 |
| * | | | | | | | | Save and use actual diff base commit for MR diff highlighting | Douwe Maan | 2016-01-20 | 10 | -32/+75 |
| * | | | | | | | | Update tests | Douwe Maan | 2016-01-20 | 3 | -3/+3 |
| * | | | | | | | | Fix MR diff_refs | Douwe Maan | 2016-01-20 | 3 | -4/+4 |
| * | | | | | | | | Properly handle HTML entities with inline diffs | Douwe Maan | 2016-01-20 | 5 | -20/+24 |
| * | | | | | | | | Restore helper | Douwe Maan | 2016-01-20 | 1 | -0/+4 |
| * | | | | | | | | Merge branch 'master' into issue_3945 | Douwe Maan | 2016-01-20 | 132 | -275/+1031 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Move parallel diff logic to separate class | Douwe Maan | 2016-01-20 | 8 | -127/+148 |
| * | | | | | | | | Check if MR is not broken. | Rubén Dávila | 2016-01-19 | 1 | -1/+1 |
| * | | | | | | | | Add missing specs | Douwe Maan | 2016-01-19 | 1 | -0/+21 |
| * | | | | | | | | Don't crash when file can't be highlighted | Douwe Maan | 2016-01-19 | 1 | -9/+3 |
| * | | | | | | | | Refactor Gitlab::Highlight and fix tests | Douwe Maan | 2016-01-19 | 7 | -135/+131 |