summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix scss variable refs.backport-time-tracking-ceBryce Johnson2017-01-152-3/+4
* Fix haml-lint complain.Ruben Davila2017-01-151-1/+1
* Slight modification to the docRegis Freyd2017-01-151-5/+2
* Bring changes that were present only in EE.Ruben Davila2017-01-151-14/+12
* Prevent including Vue twiceAlfredo Sumaran2017-01-151-3/+0
* Backport backend work for time tracking.Ruben Davila2017-01-1530-17/+692
* Backport timetracking frontend to CE.Bryce Johnson2017-01-1522-16/+792
* Merge branch '26698-fix-master' into 'master' Rémy Coutable2017-01-151-1/+1
|\
| * Remove trailing whitespaceRémy Coutable2017-01-151-1/+1
* | Merge branch 'pipelines_missing_pagination' into 'master' Fatih Acet2017-01-154-10/+19
|\ \
| * | change how pagination component is loadedpipelines_missing_paginationRegis2017-01-153-2/+1
| * | fix pagination component handling different header styles from different serv...Regis2017-01-131-8/+18
* | | Merge branch 'allow_plus_sign_for_snippets' into 'master' Rémy Coutable2017-01-153-2/+20
|\ \ \ | |_|/ |/| |
| * | Allow to use + symbol in filenamesblackst0ne2017-01-153-2/+20
* | | Merge branch 'class-name-to-string' into 'master' Rémy Coutable2017-01-152-3/+3
|\ \ \ | |/ / |/| |
| * | Use string for class_name option for lazy autoload classSemyon Pupkov2017-01-152-3/+3
* | | Merge branch 'patch-1' into 'master' Rémy Coutable2017-01-151-1/+10
|\ \ \
| * | | existing folders and existing repos should not use the same set of instructio...keen992016-03-291-1/+10
* | | | Merge branch 'patch-2' into 'master' Rémy Coutable2017-01-151-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | use plain shell Elan Ruusamäe2016-04-031-1/+1
* | | | Merge branch 'bug/project-feature-compatibility' into 'master' Douwe Maan2017-01-142-1/+6
|\ \ \ \
| * | | | Mutate the attribute instead of issuing a write operation to the DBbug/project-feature-compatibilityGabriel Mazetto2017-01-122-1/+6
* | | | | Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-tha...Douwe Maan2017-01-142-5/+2
|\ \ \ \ \
| * | | | | Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-122-5/+2
* | | | | | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-143-4/+26
|\ \ \ \ \ \
| * | | | | | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-123-4/+26
* | | | | | | Merge branch 'fix-build-sort-order' into 'master' Robert Speicher2017-01-134-1/+30
|\ \ \ \ \ \ \
| * | | | | | | revise sortable_name test formattingMike Greiling2017-01-131-4/+1
| * | | | | | | prefer unit test on model over view testfix-build-sort-orderMike Greiling2017-01-022-35/+22
| * | | | | | | rename sort methodMike Greiling2017-01-022-2/+2
| * | | | | | | add CHANGELOG.md entry for !8277Mike Greiling2017-01-021-0/+4
| * | | | | | | add tests for natural sorting of build namesMike Greiling2017-01-021-0/+35
| * | | | | | | add natural sorting token for build namesMike Greiling2017-01-022-1/+7
* | | | | | | | Merge branch 'fix-single-team-specs' into 'master' Robert Speicher2017-01-132-8/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve disabled state selectfix-single-team-specsLuke "Jared" Bennett2017-01-132-8/+88
* | | | | | | | | Merge branch 'fix/merge-separate-build-spec-files' into 'master' Robert Speicher2017-01-132-1341/+1275
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Rubocop offense in build specsfix/merge-separate-build-spec-filesGrzegorz Bizon2017-01-131-1/+0
| * | | | | | | | | Remove empty build spec file from invalid locationGrzegorz Bizon2017-01-131-6/+0
| * | | | | | | | | Merge build specs into file that has valid locationGrzegorz Bizon2017-01-132-1335/+1276
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/serialized-commit-path' into 'master' Rémy Coutable2017-01-133-4/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Changelog for commit links fix on pipelines pagefix/serialized-commit-pathGrzegorz Bizon2017-01-131-0/+4
| * | | | | | | | | Update commit entity to point to valid commit pageGrzegorz Bizon2017-01-132-4/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-fix-broken-link-docs' into 'master' Robert Speicher2017-01-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken link in docszj-fix-broken-link-docsZ.J. van de Weg2017-01-111-1/+1
* | | | | | | | | | Merge branch 'env-var-in-redis-config' into 'master' Rémy Coutable2017-01-135-2/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow to use ENV variables in redis configSemyon Pupkov2017-01-135-2/+28
* | | | | | | | | | | Merge branch 'milestone-issuable-labels-spacing' into 'master' Annabel Dunstone Gray2017-01-131-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed spacing of labels in issuable row on milestone#showPhil Hughes2017-01-131-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-ruby21-milestone-api-specs' into 'master' Sean McGivern2017-01-131-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Put .gitlab-ci.yml back to only 2.1 on masterSean McGivern2017-01-131-0/+5
View Lorry Controller Status