summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | color changes to navigationPhil Hughes2017-06-211-19/+38
| * | | | | | | | | | | | | | | | | | | | | | fixed typo in selector :see_no_evil:Phil Hughes2017-06-212-3/+3
| * | | | | | | | | | | | | | | | | | | | | | fixed scss-lint jobPhil Hughes2017-06-211-1/+1
| * | | | | | | | | | | | | | | | | | | | | | added section to profile/preferencesPhil Hughes2017-06-217-0/+37
| * | | | | | | | | | | | | | | | | | | | | | fixed dashboard projects nav item being activePhil Hughes2017-06-212-3/+6
| * | | | | | | | | | | | | | | | | | | | | | added signed out subnavPhil Hughes2017-06-213-0/+24
| * | | | | | | | | | | | | | | | | | | | | | spacing fixesPhil Hughes2017-06-213-4/+31
| * | | | | | | | | | | | | | | | | | | | | | fix scss-lint jobPhil Hughes2017-06-211-11/+13
| * | | | | | | | | | | | | | | | | | | | | | Top navigation redesignPhil Hughes2017-06-219-5/+266
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-premailer-gem-for-filesystem' into 'master'Robert Speicher2017-06-263-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ret...Stan Hu2017-06-263-6/+12
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '33846-no-runner-for-admin' into 'master'Rémy Coutable2017-06-263-35/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Add explicit message when no runners on adminTakuya Noguchi2017-06-263-35/+65
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '34320-environment-detail-job' into 'master'Filipa Lacerda2017-06-262-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Truncate long job names in environment view; wrap author to next lineAnnabel Dunstone Gray2017-06-262-6/+9
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '23036-replace-dashboard-mr-spinach' into 'master'Rémy Coutable2017-06-266-170/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Replaces 'dashboard/merge_requests' spinach with rspecAlexander Randa2017-06-266-170/+114
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '33546-mini-pipeline' into 'master'Phil Hughes2017-06-262-2/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix endpoint not being update correctlyFilipa Lacerda2017-06-262-2/+44
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch '33933-fix-deployment-indicator-date' into 'master'Robert Speicher2017-06-262-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix bug where Service `created_at` time was used instead of deployment time.33933-fix-deployment-indicator-datePawel Chojnacki2017-06-222-3/+6
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Update GITLAB_SHELL_VERSION to 5.0.6Adam Niedzielski2017-06-261-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'backport-renew-exclusive-lease' into 'master'Douwe Maan2017-06-262-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Introduce #renew for ExclusiveLeasebackport-renew-exclusive-leaseGabriel Mazetto2017-06-242-1/+31
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'backport-destroy-service-spec-fixes' into 'master'Douwe Maan2017-06-261-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fixed DestroyService spec to actually test if removal was successfulbackport-destroy-service-spec-fixesGabriel Mazetto2017-06-241-2/+3
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'doc_wiki_page_hook_actions' into 'master'Rémy Coutable2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Hint about the wiki page hook actions. Fixes #34242Diego de Souza Mendes2017-06-231-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '34207-remove-bin-ci-upgrade-rb' into 'master'Rémy Coutable2017-06-262-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove bin/ci/upgrade.rb as not working allTakuya Noguchi2017-06-242-3/+4
* | | | | | | | | | | | | | | | | | | | | Merge branch '34302-update-test' into 'master'Phil Hughes2017-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix click not being able to find the current element to use trigger('click') ...34302-update-testFilipa Lacerda2017-06-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch '34289-drop-gfm-on-milestone-issuable-title' into 'master'Sean McGivern2017-06-262-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Drop GFM support for issuable title on milestone for consistency and performanceTakuya Noguchi2017-06-262-1/+5
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-examples-deployment-composer-npm' into 'master'Rémy Coutable2017-06-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Change composer update to install to follow PHP/composer best practiceGabriele2017-06-221-3/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-revert-annotate-for-blame' into 'master'Rémy Coutable2017-06-266-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Revert "Annotate" to "Blame"sh-revert-annotate-for-blameStan Hu2017-06-227-10/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'winh-karma-suppress-vue-tips' into 'master'Clement Ho2017-06-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Suppress Vue tips when running Karmawinh-karma-suppress-vue-tipswinh2017-06-221-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/add-new-services' into 'master'Sean McGivern2017-06-2627-84/+279
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | fix spec failuresJames Lopez2017-06-252-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | fix spec failuresJames Lopez2017-06-241-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | fix spec failuresJames Lopez2017-06-231-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | fix spec failuresJames Lopez2017-06-234-6/+4
| * | | | | | | | | | | | | | | | | | | | | | | update code based on feedbackJames Lopez2017-06-237-15/+14
| * | | | | | | | | | | | | | | | | | | | | | | fix bug in emails destroy serviceJames Lopez2017-06-232-3/+2
| * | | | | | | | | | | | | | | | | | | | | | | fix profiles specJames Lopez2017-06-231-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | refactor update user service not to do auth checksJames Lopez2017-06-2317-68/+42