summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add CHANGELOG.md entry for !9386update-vue-2.1Mike Greiling2017-02-201-0/+4
* use CommonJS vue distributionMike Greiling2017-02-201-1/+1
* upgrade Vue from v2.0.3 to v2.1.10Mike Greiling2017-02-202-7/+7
* Merge branch 'fix-vue-production-build' into 'master' Jacob Schatz2017-02-201-2/+1
|\
| * utilize pre-minified Vue in production since no CJS distribution is availablefix-vue-production-buildMike Greiling2017-02-191-2/+1
* | Merge branch 'fix-grammar' into 'master' Robert Speicher2017-02-203-5/+5
|\ \
| * | Fix some grammar in the API docsRobert Schilling2017-02-203-5/+5
* | | Merge branch 'link-to-rspec-features-docs' into 'master' Rémy Coutable2017-02-201-0/+8
|\ \ \
| * | | Add more links in the Features/Integration testing documentationRichard Macklin2017-02-131-3/+9
| * | | Add link to external documentation of rspec-rails feature specsRichard Macklin2017-02-031-1/+3
* | | | Merge branch 'api-post-block' into 'master' Sean McGivern2017-02-207-21/+127
|\ \ \ \ | |_|/ / |/| | |
| * | | API: Use POST to (un)block a userapi-post-blockRobert Schilling2017-02-207-21/+127
* | | | Merge branch 'api-grape-datetime' into 'master' Rémy Coutable2017-02-203-22/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Use grape validation for datesapi-grape-datetimeRobert Schilling2017-02-203-22/+3
* | | | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-209-25/+100
|\ \ \ \
| * | | | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-209-25/+100
* | | | | Merge branch 'docs/ldap-location' into 'master' Achilleas Pipinellis2017-02-201-3/+1
|\ \ \ \ \
| * | | | | Change wording for LDAP doc that was moved to a new locationAchilleas Pipinellis2017-02-201-3/+1
* | | | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' Rémy Coutable2017-02-202-2/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Prevent project team from being truncated too early during project destructionsh-fix-project-team-truncation-in-destroyStan Hu2017-02-192-2/+20
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \