Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5320-fix-gitlab-features-env-var' into 'master' | Grzegorz Bizon | 2018-04-19 | 4 | -6/+6 |
|\ | |||||
| * | Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#featu...5320-fix-gitlab-features-env-var | Dylan Griffith | 2018-04-09 | 4 | -6/+6 |
* | | Merge branch '34262-show-current-labels-when-editing' into 'master' | Mike Greiling | 2018-04-18 | 7 | -8/+43 |
|\ \ | |||||
| * | | Resolve "View labels when editing labels in sidebar and board sidebar" | André Luís | 2018-04-18 | 7 | -8/+43 |
|/ / | |||||
* | | Merge branch 'sh-bump-chrome-and-chromedriver' into 'master' | Mike Greiling | 2018-04-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump CI to use Chrome V65 and ChromeDriver 2.36 | Stan Hu | 2018-04-18 | 1 | -1/+1 |
* | | | Merge branch 'revert-goldiloader' into 'master' | Robert Speicher | 2018-04-18 | 22 | -174/+43 |
|\ \ \ | |||||
| * | | | Removed goldiloader changelog file | Yorick Peterse | 2018-04-18 | 1 | -5/+0 |
| * | | | Revert the addition of goldiloader | Yorick Peterse | 2018-04-18 | 21 | -169/+43 |
* | | | | Merge branch '5706-fix_container_scanning_in_vendored_gitlab_ci_yml' into 'ma... | Robert Speicher | 2018-04-18 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Avoid infinite loop in container scanning job. Refs gitlab-org/gitlab-ee#5706 | Olivier Gonzalez | 2018-04-18 | 1 | -1/+3 |
* | | | | | Merge branch 'docs-fix-sp-examples' into 'master' | Marcia Ramos | 2018-04-18 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fix code climate example | Olivier Gonzalez | 2018-04-09 | 1 | -1/+5 |
* | | | | | | Merge branch 'bvl-shared-groups-on-group-page' into 'master' | Rémy Coutable | 2018-04-18 | 5 | -15/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Don't include projects shared as group-descendants" | Bob Van Landuyt | 2018-04-18 | 3 | -15/+3 |
| * | | | | | | Recover from errors when a parent is not preloaded | Bob Van Landuyt | 2018-04-18 | 3 | -2/+36 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fj-42354-custom-hooks-not-triggered-by-UI-wiki-edit' into 'master' | Douwe Maan | 2018-04-18 | 15 | -47/+282 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix Custom hooks are not triggered by UI wiki edit | Francisco Javier López | 2018-04-18 | 15 | -47/+282 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'docs-fix_dast_example' into 'master' | Marcia Ramos | 2018-04-18 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix DAST example in documentation | Olivier Gonzalez | 2018-04-18 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'rfc-3676-mailsig' into 'master' | Sean McGivern | 2018-04-18 | 3 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | changelog: added entry | Enrico Scholz | 2018-04-18 | 1 | -0/+5 |
| * | | | | | set proper signature marker in mails | Enrico Scholz | 2018-04-18 | 2 | -2/+2 |
* | | | | | | Merge branch 'improve-cleanup-steps-for-background-migrations' into 'master' | Sean McGivern | 2018-04-18 | 1 | -3/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add more detail to cleanup steps for background migrations | Sean McGivern | 2018-04-18 | 1 | -3/+12 |
* | | | | | | | Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master' | Filipa Lacerda | 2018-04-18 | 2 | -5/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix regression in new merge request screen | Lukas Eipert | 2018-04-17 | 2 | -5/+1 |
* | | | | | | | | Merge branch 'ide-commit-box-highlight' into 'master' | Filipa Lacerda | 2018-04-18 | 9 | -169/+503 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | changed data into a array of objects | Phil Hughes | 2018-04-17 | 1 | -8/+11 |
| * | | | | | | | remove helpText test from radio_group_spec.js | Phil Hughes | 2018-04-17 | 1 | -13/+0 |
| * | | | | | | | updates to component | Phil Hughes | 2018-04-16 | 6 | -112/+78 |
| * | | | | | | | added specs to message_field.vue | Phil Hughes | 2018-04-16 | 2 | -3/+183 |
| * | | | | | | | Improve web IDE commit input | Phil Hughes | 2018-04-16 | 6 | -65/+263 |
* | | | | | | | | Merge branch 'bw-commonmark-cached-markdown-version' into 'master' | Sean McGivern | 2018-04-18 | 3 | -73/+142 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | for cached markdown fields, select the correct engine | Brett Walker | 2018-04-17 | 3 | -73/+142 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master' | Sean McGivern | 2018-04-18 | 18 | -20/+32 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Fix typos in comments [ci skip]blackst0ne-rails5-add-safe-params-helper | blackst0ne | 2018-04-08 | 1 | -2/+2 |
| * | | | | | | | [Rails5] Add `safe_params` helper | blackst0ne | 2018-04-08 | 18 | -20/+32 |
* | | | | | | | | Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'" | Douwe Maan | 2018-04-18 | 5 | -145/+144 |
* | | | | | | | | Merge branch 'fix/security-docs-link' into 'master' | Marin Jankovski | 2018-04-18 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix link in Security Developer Workflow.md | James Lopez | 2018-04-18 | 1 | -1/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master' | Douwe Maan | 2018-04-18 | 22 | -10/+203 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use `bulk_perform_async` to schedule issue due emails | Sean McGivern | 2018-04-17 | 2 | -5/+4 |
| * | | | | | | | | Make issue due email more consistent with other mailers | Sean McGivern | 2018-04-17 | 2 | -5/+5 |
| * | | | | | | | | Clarify that due date emails are in the server's timezone | Sean McGivern | 2018-04-10 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email' | Sean McGivern | 2018-04-10 | 1115 | -18945/+52481 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Send emails for issues due tomorrow | Sean McGivern | 2018-03-30 | 13 | -32/+87 |
| * | | | | | | | | | Only send issue due emails to participants and custom subscribers | Sean McGivern | 2018-03-30 | 9 | -15/+39 |
| * | | | | | | | | | Merge branch 'master' into stuartnelson3/gitlab-ce-stn/issue-due-email | Sean McGivern | 2018-03-30 | 489 | -4121/+11302 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Send issue due emails to all participants | Sean McGivern | 2018-03-30 | 4 | -25/+34 |