summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-pipeline-metrics-failure' into 'master' dz-check-if-green23430-accept-full-linkedin-url-on-gitlab-profile-pageDouwe Maan2016-10-171-2/+2
|\
| * Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge...fix-pipeline-metrics-failureKamil Trzcinski2016-10-171-2/+2
* | Merge branch 'fix_test_env' into 'master' Dmitriy Zaporozhets2016-10-171-1/+3
|\ \
| * | Fix Test Env (proper error handling when gitlab-shell is not clonned)Valery Sizov2016-10-171-1/+3
| |/
* | Merge branch 'safari-is-baNaNas' into 'master' Rémy Coutable2016-10-175-109/+164
|\ \ | |/ |/|
| * Convert due_date_select.js filetype to es6.safari-is-baNaNasBryce Johnson2016-10-175-109/+164
| * Stop directly parsing due_date with Date.parse, prefer parsing implicitly.Bryce Johnson2016-10-171-2/+2
* | Merge branch 'dz-fix-spinach-mr' into 'master' Dmitriy Zaporozhets2016-10-171-0/+1
|\ \
| * | Fix randomly crashing spinach test for merge requestDmitriy Zaporozhets2016-10-171-0/+1
* | | Merge branch 'fix-spinach-atom-feed-failure-due-to-carriage-returns' into 'ma...Dmitriy Zaporozhets2016-10-171-1/+1
|\ \ \
| * | | [Great spinach fix] Replace gsub with deleteValery Sizov2016-10-171-1/+1
| * | | Remove carriage returns from commit description as summary is on a newline an...Luke Bennett2016-10-171-1/+1
| |/ /
* | | Merge branch 'add-pipeline-metrics-worker' into 'master' Kamil Trzciński2016-10-175-22/+92
|\ \ \ | |/ / |/| |
| * | Improve spec for pipeline metrics workeradd-pipeline-metrics-workerKamil Trzcinski2016-10-173-23/+75
| * | Add Pipeline metrics workerKamil Trzcinski2016-10-173-4/+22
* | | Merge branch 'ebraminio/gitlab-ce-master' into 'master'Robert Speicher2016-10-178-9/+46
|\ \ \ | |_|/ |/| |
| * | Add RTL support to markdown rendererEbrahim Byagowi2016-10-168-9/+46
* | | Merge branch 'fix-trending-projects-spinach-failure' into 'master' Dmitriy Zaporozhets2016-10-172-0/+5
|\ \ \ | |_|/ |/| |
| * | Fix trending projects Spinach failurefix-trending-projects-spinach-failureStan Hu2016-10-142-0/+5
* | | Merge branch 'fix-compare-spec' into 'master' Stan Hu2016-10-171-1/+1
|\ \ \
| * | | Fix broken rspec in compare textStan Hu2016-10-161-1/+1
|/ / /
* | | Merge branch 'fix-spinach-compare-tests' into 'master' Stan Hu2016-10-174-10/+33
|\ \ \
| * | | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-163-8/+23
| * | | Fix broken Spinach tests caused by changes in !6550Stan Hu2016-10-162-7/+15
|/ / /
* | | Merge branch 'dz-fix-branches-tab-test' into 'master' Dmitriy Zaporozhets2016-10-161-1/+1
|\ \ \
| * | | Fix active tab test for branches pagedz-fix-branches-tab-testDmitriy Zaporozhets2016-10-161-1/+1
* | | | Merge branch 'fix-merge-request-diff-spinach-failures' into 'master' Dmitriy Zaporozhets2016-10-163-4/+12
|\ \ \ \
| * | | | Fix merge requests feature testsfix-merge-request-diff-spinach-failuresDmitriy Zaporozhets2016-10-161-1/+5
| * | | | Wait for ajax call in merge request unsubscribe testDmitriy Zaporozhets2016-10-161-0/+2
| * | | | Fix Spinach merge request diff failuresStan Hu2016-10-152-3/+5
* | | | | Merge branch 'rs-changelog-markdown' into 'master' Robert Speicher2016-10-165-137/+267
|\ \ \ \ \
| * | | | | Convert CHANGELOG to MarkdownRobert Speicher2016-10-165-137/+267
|/ / / / /
* | | | | Merge branch 'docs/change-docs-reviewers' into 'master' Achilleas Pipinellis2016-10-161-5/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into 'docs/change-docs-reviewers'Achilleas Pipinellis2016-10-16225-1311/+3428
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'dz-fix-group-milestone-creation' into 'master' Dmitriy Zaporozhets2016-10-161-4/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix 500 error when creating mileston from group pagedz-fix-group-milestone-creationDmitriy Zaporozhets2016-10-161-4/+5
|/ / / /
* | | | Merge branch 'dz-fix-group-with-dot' into 'master' Dmitriy Zaporozhets2016-10-162-1/+10
|\ \ \ \
| * | | | Fix 404 when group path has dot in the namedz-fix-group-with-dotDmitriy Zaporozhets2016-10-162-1/+10
|/ / / /
* | | | Merge branch '23353-add-bookclub-to-university' into 'master' Achilleas Pipinellis2016-10-163-0/+133
|\ \ \ \
| * | | | Added book club to university23353-add-bookclub-to-universitySean Packham2016-10-143-0/+133
* | | | | Merge branch 'clarify-cache-and-artifact-paths' into 'master' Achilleas Pipinellis2016-10-161-3/+4
|\ \ \ \ \
| * | | | | Document restrictions on cache and artifact pathsNick Thomas2016-10-141-3/+4
* | | | | | Merge branch 'sh-fix-ruby-2-1' into 'master' Stan Hu2016-10-161-2/+2
|\ \ \ \ \ \
| * | | | | | Fix Hash syntax to work for both Ruby 2.1 and 2.3sh-fix-ruby-2-1Stan Hu2016-10-151-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-broken-scss-lint' into 'master' Stan Hu2016-10-161-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix broken SCSS linter errors due to missing newlinesStan Hu2016-10-151-0/+3
|/ / / / /
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceJacob Schatz2016-10-154-10/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch 'dz-handle-unmatched-routes' into 'master' Dmitriy Zaporozhets2016-10-153-2/+9
| |\ \ \ \ \
| | * | | | | Revert "Update git over http test to match new routing"dz-handle-unmatched-routesDmitriy Zaporozhets2016-10-151-2/+3
| | * | | | | Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-152-0/+6