summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Finished up mattermost team creationzj-create-mattermost-team-lbLuke "Jared" Bennett2017-02-229-15/+289
* Fix bad merge [ci skip]Z.J. van de Weg2017-02-202-6/+6
* Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-20522-4043/+6262
|\
| * Merge branch '28082-deleted-branch-event-404' into 'master'Rémy Coutable2017-02-202-5/+7
| |\
| | * Remove Link from Push Events for deleted branchesJan Christophersen2017-02-152-5/+7
| * | Merge branch 'api-remove-deploy-key-disable' into 'master'Sean McGivern2017-02-205-73/+14
| |\ \
| | * | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disableRobert Schilling2017-02-205-73/+14
| * | | Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job...Rémy Coutable2017-02-203-1/+6
| |\ \ \
| | * | | fix failed spec because haml_lintwendy04022017-02-191-1/+1
| | * | | fix incorrect sidekiq concurrency count in admin background pagewendy04022017-02-193-1/+6
| * | | | Merge branch 'remove-imports-loader-window-bind' into 'master' Filipa Lacerda2017-02-20132-143/+129
| |\ \ \ \
| | * | | | fix overlooked window binding in spec filesremove-imports-loader-window-bindMike Greiling2017-02-1724-24/+24
| | * | | | remove imports loaderMike Greiling2017-02-173-14/+0
| | * | | | replace implicit this == window with explicit bindingMike Greiling2017-02-17105-105/+105
| * | | | | Merge branch '28295-mr-loading-icon' into 'master' Filipa Lacerda2017-02-202-2/+1
| |\ \ \ \ \
| | * | | | | loading icon sometimes toggled alongside MR pipeline contents28295-mr-loading-iconSimon Knox2017-02-192-2/+1
| * | | | | | Merge branch 'patch-13' into 'master'Rémy Coutable2017-02-201-0/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | exclude rpc_pipefs from system disc infoBen Bodenmiller2017-02-181-0/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' Jacob Schatz2017-02-1813-28/+166
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make sure events have most properties definedadd-additional-checks-to-ca-dataAlfredo Sumaran2017-02-105-28/+137
| | * | | | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-108-0/+29
| * | | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-1812-149/+214
| |\ \ \ \ \
| | * | | | | Todo done clicking is kind of unusable.Jacopo2017-02-1712-149/+214
| * | | | | | Merge branch 'change_queue_weight' into 'master' Yorick Peterse2017-02-182-1/+5
| |\ \ \ \ \ \
| | * | | | | | Increase process_commit queue weight from 2 to 3blackst0ne2017-02-172-1/+5
| * | | | | | | Merge branch 'global-dropdown-edits' into 'master' Alfredo Sumaran2017-02-175-26/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Fix issuables_counter_specglobal-dropdown-editsAnnabel Dunstone Gray2017-02-171-2/+2
| | * | | | | | | Remove application theme settings from preferencesAnnabel Dunstone Gray2017-02-172-14/+0
| | * | | | | | | Remove badge styling in dropdown; remove blue outlineAnnabel Dunstone Gray2017-02-172-9/+7
| | * | | | | | | Make active links in dropdown boldAnnabel Dunstone Gray2017-02-171-1/+1
| * | | | | | | | Merge branch '28313-words' into 'master' Achilleas Pipinellis2017-02-172-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix job status -> pipeline status28313-wordsMark Pundsack2017-02-162-5/+5
| * | | | | | | | | Merge branch 'directly-addressed-todo-docs' into 'master' Achilleas Pipinellis2017-02-171-1/+25
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add docs for directly addressed todosdirectly-addressed-todo-docsSean McGivern2017-02-171-1/+25
| * | | | | | | | | | Merge branch '23819-fix-milestone-counters-to-top-right-of-panel-headings' in...Clement Ho2017-02-173-3/+27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix position of counters within milestone panelsAndrew Smith2017-02-153-3/+27
| * | | | | | | | | | | Merge branch '28353-little-grammar-issue' into 'master' Annabel Dunstone Gray2017-02-173-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix grammer issue in admin/runners28353-little-grammar-issueClement Ho2017-02-173-2/+6
| * | | | | | | | | | | Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master' Stan Hu2017-02-172-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Remove issue and MR counts from labels indexremove-issue-and-mr-counts-from-labels-pageSean McGivern2017-02-172-6/+8
| * | | | | | | | | | | Update CHANGELOG.md for 8.16.6DJ Mountney2017-02-1712-45/+16
| * | | | | | | | | | | Merge branch 'add-patch-release-changelogs' into 'master' DJ Mountney2017-02-171-0/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'dev/master' into add-patch-release-changelogsDJ Mountney2017-02-171-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| | * | | | | | | | | | | Update CHANGELOG.md for 8.14.10DJ Mountney2017-02-151-0/+4
| | * | | | | | | | | | | Update CHANGELOG.md for 8.15.7DJ Mountney2017-02-151-0/+4
| * | | | | | | | | | | | Merge branch 'add-yarn-documentation' into 'master' Clement Ho2017-02-177-29/+75
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | correct gitlab version that started requiring yarnadd-yarn-documentationMike Greiling2017-02-171-3/+4
| | * | | | | | | | | | | | pluralize "this step"Mike Greiling2017-02-171-1/+1
| | * | | | | | | | | | | | add CHANGELOG.md entry for !9316Mike Greiling2017-02-161-0/+4
| | * | | | | | | | | | | | Merge branch 'master' into add-yarn-documentationMike Greiling2017-02-16128-1930/+2803
| | |\ \ \ \ \ \ \ \ \ \ \ \