summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use latest chrome and chrome driver in GitLab QAfix/gb/qa/use-latest-chrome-version-in-qa-dockerfileGrzegorz Bizon2017-06-271-10/+3
|
* Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'Sean McGivern2017-06-277-3/+63
|\ | | | | | | | | | | | | Store merge request ref_fetched status in the database Closes #34052 See merge request !12424
| * Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-databaseAdam Niedzielski2017-06-267-3/+63
| | | | | | | | Closes #34052
* | Merge branch '34282-fix-api-using-include_missing-false' into 'master'Grzegorz Bizon2017-06-273-1/+16
|\ \ | | | | | | | | | | | | | | | | | | Fix optional arugments for POST :id/variables Closes #34282 See merge request !12474
| * | Add changelog entryLin Jen-Shin2017-06-271-0/+4
| | |
| * | Fix optional args for POST :id/variablesLin Jen-Shin2017-06-272-1/+12
| | | | | | | | | | | | | | | Always use declared_params(include_missing: false) so that we don't give nils for optional arguments
* | | Merge branch 'winh-mr-widget-no-pipeline' into 'master'Phil Hughes2017-06-272-19/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Handle missing pipeline in merge request widget Closes #32987 See merge request !12127
| * | | Handle Promise rejections in mr_widget_pipeline_spec.jswinh2017-06-261-24/+35
| | | |
| * | | Handle missing pipeline in merge request widgetwinh2017-06-261-1/+8
| | | |
| * | | Add failing test for #32987winh2017-06-221-0/+19
| | | |
* | | | Merge branch 'polish-sidebar-toggle' into 'master'Phil Hughes2017-06-277-3/+65
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Polish sidebar toggle Closes #28046 See merge request !12242
| * | | Polish sidebar toggleClement Ho2017-06-277-3/+65
|/ / /
* | | Merge branch '34309-drop-gfm-mr-ms' into 'master'Sean McGivern2017-06-273-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop GFM support for the title of Milestone/MergeReuqest in template Closes #34309 See merge request !12451
| * | | Drop GFM support for the title of Milestone/MergeRequest in templateTakuya Noguchi2017-06-273-2/+6
| | | |
* | | | Merge branch 'update_bootsnap_1.1.1' into 'master'Robert Speicher2017-06-274-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425
| * | | | Bump bootsnap to 1.1.1blackst0ne2017-06-274-0/+15
| | | | |
* | | | | Update CHANGELOG.md for 9.3.1Clement Ho2017-06-267-25/+9
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch '33600-fix-uncaught-throw-in-ee_compat_check' into 'master'Robert Speicher2017-06-261-4/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an uncaught throw in the ee_compat_check job Closes #33600 See merge request !12123
| * | | | | Fix an uncaught throw in the ee_compat_check jobRémy Coutable2017-06-211-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'remove-unused-argument' into 'master'Sean McGivern2017-06-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitlab::Git::Commit#to_diff argument See merge request !12466
| * | | | | | Remove unused Gitlab::Git::Commit#to_diff argumentJacob Vosmaer2017-06-261-2/+2
| | | | | | |
* | | | | | | Merge branch 'fix-nested-group-spec-on-mysql' into 'master'Robert Speicher2017-06-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag a spec as :nested_groups since it fails on MySQL See merge request !12459
| * | | | | | | Tag a spec as :nested_groups since it fails on MySQLfix-nested-group-spec-on-mysqlRémy Coutable2017-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'accepting-mrs-more-prominent' into 'master'Sid Sijbrandij2017-06-261-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make accepting mrs more prominent See merge request !12446
| * | | | | | | | make accepting mrs more prominentaccepting-mrs-more-prominentJob van der Voort2017-06-261-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch ↵Douwe Maan2017-06-265-1/+1150
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34286_add_esperanto_translations_for_cycle_analytics_and_project_and_repository_pages' into 'master' Add Esperanto translations for Cycle Analytics, Project, and Repository pages Closes #34286 See merge request !12442
| * | | | | | | | | Add Esperanto translations for Cycle Analytics, Project, and Repository pages黄涛2017-06-265-1/+1150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #34286
* | | | | | | | | | Merge branch 'experimental-top-nav' into 'master'Annabel Dunstone Gray2017-06-2618-8/+490
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Top navigation redesign Closes #34022, #34035, #34037, #34038, and #34021 See merge request !12214
| * | | | | | | | | | mobile spacing improvementsexperimental-top-navPhil Hughes2017-06-232-21/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed random colors left over from the original nav
| * | | | | | | | | | fixed `This project` badge background & text colorPhil Hughes2017-06-231-2/+10
| | | | | | | | | | |
| * | | | | | | | | | updates to spacing & alignmentPhil Hughes2017-06-234-18/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | combine logo & wordmark mobile improvements
| * | | | | | | | | | Merge branch 'master' into experimental-top-navPhil Hughes2017-06-23541-5779/+9148
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mobile improvementsPhil Hughes2017-06-222-16/+13
| | | | | | | | | | | |
| * | | | | | | | | | | fixed scss-lintPhil Hughes2017-06-221-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fixed some design issuesPhil Hughes2017-06-222-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated some spacing & colors
| * | | | | | | | | | | padding updatesPhil Hughes2017-06-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed mobile nav colors
| * | | | | | | | | | | fixed scss-lint jobPhil Hughes2017-06-215-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only display the toggle setting in development env for now
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is now only shown as active when on the dashbord/projects controller [ci skip]
| * | | | | | | | | | | added signed out subnavPhil Hughes2017-06-213-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also added the help link back into the nav bar
| * | | | | | | | | | | spacing fixesPhil Hughes2017-06-213-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | made the title a link back to the dashboard [ci skip]
| * | | | | | | | | | | fix scss-lint jobPhil Hughes2017-06-211-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Top navigation redesignPhil Hughes2017-06-219-5/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794
* | | | | | | | | | | | 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 retrieval of assets Closes #34231 See merge request !12456
| * | | | | | | | | | | | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ↵Stan Hu2017-06-263-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieval of assets Since asset compilation was disabled in GitLab 9.3, the premailer-rails gem would fall back to fetching assets via HTTP(s) since the Sidekiq working directory was not the Rails root. In some instances, SSL verification would fail, preventing e-mails from being sent. premailer-rails 1.9.7 has a fix (https://github.com/fphilipe/premailer-rails/pull/195) that uses an absolute directory to load assets from the filesystem so that the assets can be fetched locally instead of over the network. Closes #34231
* | | | | | | | | | | | | Merge branch '33846-no-runner-for-admin' into 'master'Rémy Coutable2017-06-263-35/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit message when no runners on admin Closes #33846 See merge request !12266
| * | | | | | | | | | | | | Add explicit message when no runners on adminTakuya Noguchi2017-06-263-35/+65
|/ / / / / / / / / / / / /