summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5320-fix-gitlab-features-env-var' into 'master'Grzegorz Bizon2018-04-194-6/+6
|\
| * Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#featu...5320-fix-gitlab-features-env-varDylan Griffith2018-04-094-6/+6
* | Merge branch '34262-show-current-labels-when-editing' into 'master'Mike Greiling2018-04-187-8/+43
|\ \
| * | Resolve "View labels when editing labels in sidebar and board sidebar"André Luís2018-04-187-8/+43
|/ /
* | Merge branch 'sh-bump-chrome-and-chromedriver' into 'master'Mike Greiling2018-04-181-1/+1
|\ \
| * | Bump CI to use Chrome V65 and ChromeDriver 2.36Stan Hu2018-04-181-1/+1
* | | Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-1822-174/+43
|\ \ \
| * | | Removed goldiloader changelog fileYorick Peterse2018-04-181-5/+0
| * | | Revert the addition of goldiloaderYorick Peterse2018-04-1821-169/+43
* | | | Merge branch '5706-fix_container_scanning_in_vendored_gitlab_ci_yml' into 'ma...Robert Speicher2018-04-181-1/+3
|\ \ \ \
| * | | | Avoid infinite loop in container scanning job. Refs gitlab-org/gitlab-ee#5706Olivier Gonzalez2018-04-181-1/+3
* | | | | Merge branch 'docs-fix-sp-examples' into 'master'Marcia Ramos2018-04-181-1/+5
|\ \ \ \ \
| * | | | | Fix code climate exampleOlivier Gonzalez2018-04-091-1/+5
* | | | | | Merge branch 'bvl-shared-groups-on-group-page' into 'master'Rémy Coutable2018-04-185-15/+37
|\ \ \ \ \ \
| * | | | | | Revert "Don't include projects shared as group-descendants"Bob Van Landuyt2018-04-183-15/+3
| * | | | | | Recover from errors when a parent is not preloadedBob Van Landuyt2018-04-183-2/+36
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fj-42354-custom-hooks-not-triggered-by-UI-wiki-edit' into 'master'Douwe Maan2018-04-1815-47/+282
|\ \ \ \ \ \
| * | | | | | Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López2018-04-1815-47/+282
|/ / / / / /
* | | | | | Merge branch 'docs-fix_dast_example' into 'master'Marcia Ramos2018-04-181-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix DAST example in documentationOlivier Gonzalez2018-04-181-3/+3
|/ / / / /
* | | | | Merge branch 'rfc-3676-mailsig' into 'master'Sean McGivern2018-04-183-2/+7
|\ \ \ \ \
| * | | | | changelog: added entryEnrico Scholz2018-04-181-0/+5
| * | | | | set proper signature marker in mailsEnrico Scholz2018-04-182-2/+2
* | | | | | Merge branch 'improve-cleanup-steps-for-background-migrations' into 'master'Sean McGivern2018-04-181-3/+12
|\ \ \ \ \ \
| * | | | | | Add more detail to cleanup steps for background migrationsSean McGivern2018-04-181-3/+12
* | | | | | | Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master'Filipa Lacerda2018-04-182-5/+1
|\ \ \ \ \ \ \
| * | | | | | | fix regression in new merge request screenLukas Eipert2018-04-172-5/+1
* | | | | | | | Merge branch 'ide-commit-box-highlight' into 'master'Filipa Lacerda2018-04-189-169/+503
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | changed data into a array of objectsPhil Hughes2018-04-171-8/+11
| * | | | | | | remove helpText test from radio_group_spec.jsPhil Hughes2018-04-171-13/+0
| * | | | | | | updates to componentPhil Hughes2018-04-166-112/+78
| * | | | | | | added specs to message_field.vuePhil Hughes2018-04-162-3/+183
| * | | | | | | Improve web IDE commit inputPhil Hughes2018-04-166-65/+263
* | | | | | | | Merge branch 'bw-commonmark-cached-markdown-version' into 'master'Sean McGivern2018-04-183-73/+142
|\ \ \ \ \ \ \ \
| * | | | | | | | for cached markdown fields, select the correct engineBrett Walker2018-04-173-73/+142
| |/ / / / / / /
* | | | | | | | Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master'Sean McGivern2018-04-1818-20/+32
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix typos in comments [ci skip]blackst0ne-rails5-add-safe-params-helperblackst0ne2018-04-081-2/+2
| * | | | | | | [Rails5] Add `safe_params` helperblackst0ne2018-04-0818-20/+32
* | | | | | | | Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"Douwe Maan2018-04-185-145/+144
* | | | | | | | Merge branch 'fix/security-docs-link' into 'master'Marin Jankovski2018-04-181-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix link in Security Developer Workflow.mdJames Lopez2018-04-181-1/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master'Douwe Maan2018-04-1822-10/+203
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `bulk_perform_async` to schedule issue due emailsSean McGivern2018-04-172-5/+4
| * | | | | | | | Make issue due email more consistent with other mailersSean McGivern2018-04-172-5/+5
| * | | | | | | | Clarify that due date emails are in the server's timezoneSean McGivern2018-04-101-1/+2
| * | | | | | | | Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'Sean McGivern2018-04-101115-18945/+52481
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Send emails for issues due tomorrowSean McGivern2018-03-3013-32/+87
| * | | | | | | | | Only send issue due emails to participants and custom subscribersSean McGivern2018-03-309-15/+39
| * | | | | | | | | Merge branch 'master' into stuartnelson3/gitlab-ce-stn/issue-due-emailSean McGivern2018-03-30489-4121/+11302
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Send issue due emails to all participantsSean McGivern2018-03-304-25/+34