summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reduce query count for snippet searchsnippets-search-performancePhil Hughes2017-02-164-4/+8
| | | | | | | Recudes the number of queries within the snippet search from approx. 50 to approx. 14 by preloading the authors Part of #27392
* Merge branch 'dz-nested-groups-improvements-3' into 'master' Dmitriy Zaporozhets2017-02-1527-59/+103
|\ | | | | | | | | Nested groups improvements pt 3 See merge request !9227
| * Merge remote-tracking branch 'origin/master' into ↵dz-nested-groups-improvements-3Dmitriy Zaporozhets2017-02-1411-111/+443
| |\ | | | | | | | | | dz-nested-groups-improvements-3
| * \ Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-1474-1906/+5344
| |\ \ | | | | | | | | | | | | # Conflicts: # doc/api/projects.md
| * | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-1422-53/+90
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Expose Namespace#full_path in namespaces APIDmitriy Zaporozhets2017-02-145-7/+16
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'pass_coverage_value_to_commit_status_api' into 'master' Rémy Coutable2017-02-155-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to pass coverage value to commit status API Closes #27807 See merge request !9214
| * | | | add changelogwendy04022017-02-141-0/+4
| | | | |
| * | | | Make it possible to pass coverage value to commit status APIwendy04022017-02-144-2/+8
| | | | |
* | | | | Remove duplicate CHANGELOG.md entries for 8.16.5Robert Speicher2017-02-141-2/+0
| | | | |
* | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2017-02-141-0/+23
|\ \ \ \ \
| * | | | | Update CHANGELOG.md for 8.14.9Robert Speicher2017-02-141-0/+7
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 8.15.6Robert Speicher2017-02-141-0/+7
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 8.16.5Robert Speicher2017-02-141-0/+1
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 8.16.5Robert Speicher2017-02-141-0/+1
| | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update CHANGELOG.md for 8.16.5Robert Speicher2017-02-141-0/+7
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch '27759-fix-sidekiq_status-client_middleware-issue' into 'master' Robert Speicher2017-02-142-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SidekiqStatus need to be qualified in some cases Closes #27759 See merge request !9235
| * | | | | | SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issueRémy Coutable2017-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '28142-overlap-bugs' into 'master' Alfredo Sumaran2017-02-143-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix z index bugs Closes #28142 See merge request !9236
| * | | | | | | Add changelog28142-overlap-bugsAnnabel Dunstone Gray2017-02-141-0/+4
| | | | | | | |
| * | | | | | | Fix z index bugsAnnabel Dunstone Gray2017-02-142-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' into 'master' Clement Ho2017-02-142-7/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix smaller height of Activity header page Closes #27631 See merge request !8952
| * | | | | | | #27631: Add missing top-area div to activity header pagenerro2017-02-142-7/+12
| | | | | | | |
* | | | | | | | Merge branch 'fix-yarn-lock' into 'master' Alfredo Sumaran2017-02-141-101/+238
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix yarn lock and package.json mismatch caused by MR 9133 See merge request !9239
| * | | | | | | | Fix yarn lock and package.json mismatch caused by MR 9133Clement Ho2017-02-141-101/+238
| | | | | | | | |
* | | | | | | | | Merge branch 'issue_27317' into 'master' Alfredo Sumaran2017-02-142-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timezone on issue boards due date Closes #27317 See merge request !9150
| * | | | | | | | | Fix timezone on issue boards due dateissue_27317Felipe Artur2017-02-142-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch '26287-link-branch-in-calendar-activity' into 'master'Rémy Coutable2017-02-142-5/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Links to Branches in Calendar Activity Closes #26287 See merge request !9224
| * | | | | | | | | Add Links to Branches in Calendar ActivityJan Christophersen2017-02-142-5/+13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-yarn-lock-file' into 'master' Filipa Lacerda2017-02-141-3/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync yarn.lock with recent changes to package.json See merge request !9237
| * | | | | | | | | sync yarn.lock with recent changes to package.jsonfix-yarn-lock-fileMike Greiling2017-02-141-3/+129
| | | | | | | | | |
* | | | | | | | | | Merge branch 'cover-my-karma' into 'master' Clement Ho2017-02-146-2/+59
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reintroduce coverage report for JavaScript Closes #27826 and #20757 See merge request !9133
| * | | | | | | | | Include all files with 0% coverage in reportwinniehell2017-02-111-0/+35
| | | | | | | | | |
| * | | | | | | | | Reintroduce coverage report for JavaScript (!9133)winniehell2017-02-115-2/+24
| | | | | | | | | |
* | | | | | | | | | Merge branch 'requires-input-fixture' into 'master' Clement Ho2017-02-143-24/+11
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for behaviors/requires_input_spec.js See merge request !9162
| * | | | | | | | | Replace static fixture for behaviors/requires_input_spec.js (!9162)winniehell2017-02-143-24/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch 'replace-npm-with-yarn' into 'master' Filipa Lacerda2017-02-146-15/+4345
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace NPM with Yarn See merge request !9055
| * | | | | | | | | | add CHANGELOG.md entry for !9055replace-npm-with-yarnMike Greiling2017-02-141-0/+4
| | | | | | | | | | |
| * | | | | | | | | | fix eslint builds within .gitlab-ci.ymlMike Greiling2017-02-141-2/+2
| | | | | | | | | | |
| * | | | | | | | | | update yarn.lock to reflect latest package.jsonMike Greiling2017-02-131-602/+1016
| | | | | | | | | | |
| * | | | | | | | | | add yarn check to ensure package.json doesn't diverge from yarn.lockMike Greiling2017-02-131-1/+2
| | | | | | | | | | |
| * | | | | | | | | | display yarn version and node version within CI logsMike Greiling2017-02-131-0/+2
| | | | | | | | | | |
| * | | | | | | | | | add yarn lock fileMike Greiling2017-02-131-0/+3914
| | | | | | | | | | |
| * | | | | | | | | | replace npm run calls with yarnMike Greiling2017-02-133-5/+5
| | | | | | | | | | |
| * | | | | | | | | | remove recursive npm calls to avoid dependence on npm after switch to yarnMike Greiling2017-02-131-3/+3
| | | | | | | | | | |
| * | | | | | | | | | remove unnecessary "npm install"sMike Greiling2017-02-131-5/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'eslint-resolve-webpack-modules' into 'master' Filipa Lacerda2017-02-142-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable eslint to resolve webpack modules according to webpack.config.js See merge request !9218
| * | | | | | | | | | enable eslint to resolve webpack modules according to webpack.config.jseslint-resolve-webpack-modulesMike Greiling2017-02-142-4/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dynamic-todos-fixture' into 'master' Clement Ho2017-02-145-6/+59
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for right_sidebar_spec.js See merge request !9211
| * | | | | | | | | | Replace static fixture for right_sidebar_spec.js (!9211)winniehell2017-02-145-15/+38
| | | | | | | | | | |
View Lorry Controller Status