summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Also test on dev.gitlab [ci skip]zj-update-ciZ.J. van de Weg2016-11-121-1/+9
* Only run builds on master of CE or EEZ.J. van de Weg2016-11-121-4/+6
* Merge branch '24386-8-14-rc1-requires-quite-amount-of-downtime' into 'master' Stan Hu2016-11-115-5/+14
|\
| * Update 8.14-rc1 migrations to minimize downtime and deploy timeAlejandro Rodríguez2016-11-115-5/+14
* | Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-113-0/+30
|\ \
| * | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-113-0/+30
* | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-1116-1/+178
|\ \ \
| * | | Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-116-23/+20
| * | | Refactored initializer code to its own class and added testsPatricio Cano2016-11-103-7/+56
| * | | Added documentation and CHANGELOG item.Patricio Cano2016-11-104-0/+37
| * | | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-108-13/+41
| * | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-109-0/+66
* | | | Merge branch 'vue2' into 'master' Fatih Acet2016-11-1141-9582/+7023
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-102-2/+2
| * | | Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-104-27/+17
| * | | Changed how lists get sortedPhil Hughes2016-11-103-2/+6
| * | | Issue board spec fixesPhil Hughes2016-11-103-2/+4
| * | | Fixed jump to discussion button not showingPhil Hughes2016-11-101-1/+5
| * | | Changed how resolving notes is renderedPhil Hughes2016-11-104-35/+39
| * | | Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
| * | | Fixed up resolve discussionsPhil Hughes2016-11-108-27/+43
| * | | Refactor of issue boards to work with Vue2Phil Hughes2016-11-1016-234/+225
| * | | VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-103-20/+11
| * | | Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
| * | | VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
| * | | Migrate Vue v1 to v2.Fatih Acet2016-11-109-21/+23
| * | | Bump up vue version.Fatih Acet2016-11-102-9232/+6672
* | | | Merge branch 'ux-guide-restructure' into 'master' Achilleas Pipinellis2016-11-1161-1/+600
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update README.md to link to UX guideVictor Wu2016-11-111-0/+4
| * | | Remove <br> and replace GFM blockquote with the Markdown generalAchilleas Pipinellis2016-11-117-84/+10
| * | | Rename README.md to index.mdAchilleas Pipinellis2016-11-111-6/+0
| * | | [ci skip] Establish basic structure for ux_guide README.mdux-guide-restructureawhildy2016-11-1060-1/+676
* | | | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-118-57/+45
|\ \ \ \
| * | | | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-098-57/+45
* | | | | Merge branch '21764-build-page-title' into 'master' Fatih Acet2016-11-115-8/+4
|\ \ \ \ \
| * | | | | Removed soon-to-be un-needed project title additions from builds and environm...21764-build-page-titleLuke Bennett2016-11-095-8/+4
* | | | | | Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into 'mast...Fatih Acet2016-11-112-2/+19
|\ \ \ \ \ \
| * | | | | | Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchorLuke Bennett2016-11-102-2/+19
* | | | | | | Merge branch '22699-group-permssion-background-migration' into 'master' Yorick Peterse2016-11-113-1/+54
|\ \ \ \ \ \ \
| * | | | | | | Fix project records with invalid visibility_level valuesNick Thomas2016-11-103-1/+54
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-117-4/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-107-4/+23
* | | | | | | | Merge branch 'milestone-project-require' into 'master' Sean McGivern2016-11-113-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Require projects before creating milestonegfyoung2016-11-103-2/+6
* | | | | | | | | Merge branch 'mrchrisw/fix-github-link' into 'master' Achilleas Pipinellis2016-11-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use GitLab.com link, remove GitHub linkmrchrisw/fix-github-linkChris Wilson2016-11-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'use-config-param' into 'master' Sean McGivern2016-11-111-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Use config param in `Repository#update_ref!`teru2016-11-101-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '24369-remove-additional-padding' into 'master' Annabel Dunstone Gray2016-11-102-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove additional padding on right-aligned items in MR widget.Didem Acet2016-11-102-0/+5
View Lorry Controller Status