Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | removed unneeded lint commentsdispatcher-projects-efi | Simon Knox | 2018-01-15 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2018-01-15 | 91 | -919/+1180 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | dispatcher-projects-efi | |||||
| * | | | | | | | | fix tests from broken imports | Simon Knox | 2018-01-12 | 4 | -7/+9 | |
| | | | | | | | | | ||||||
| * | | | | | | | | dynamic imports for projects:e/f/i | Simon Knox | 2018-01-12 | 9 | -29/+120 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch ↵ | Grzegorz Bizon | 2018-01-15 | 2 | -6/+11 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41546-count-query-for-issues-and-mrs-runs-twice-on-group-index' into 'master' Resolve "Count query for issues and MRs runs twice on group index" Closes #41546 See merge request gitlab-org/gitlab-ce!16314 | |||||
| * | | | | | | | | Fix double execution of COUNT query on group pages41546-count-query-for-issues-and-mrs-runs-twice-on-group-index | Sean McGivern | 2018-01-09 | 2 | -6/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `finder.execute.count` twice will perform two queries, but these are all in the same file, so it's easy to just reuse them. | |||||
* | | | | | | | | | Merge branch 'fj-41598-fixing-request-mime-type' into 'master' | Douwe Maan | 2018-01-15 | 3 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing request json mime type Closes #41598 See merge request gitlab-org/gitlab-ce!16427 | |||||
| * | | | | | | | | | Fixing request json mime type | Francisco Javier López | 2018-01-15 | 3 | -3/+16 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'snippets-dispatcher-refactor' into 'master' | Phil Hughes | 2018-01-15 | 4 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher for snippets:* See merge request gitlab-org/gitlab-ce!16390 | |||||
| * | | | | | | | | | Use common form.jssnippets-dispatcher-refactor | Clement Ho | 2018-01-12 | 5 | -21/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix eslint | Clement Ho | 2018-01-11 | 4 | -4/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into snippets-dispatcher-refactor | Clement Ho | 2018-01-11 | 230 | -1467/+2886 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Code improvements | Clement Ho | 2018-01-11 | 5 | -5/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Refactor dispatcher for snippets:* | Jacob Schatz | 2018-01-11 | 5 | -3/+44 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'dispatcher-project-mr' into 'master' | Phil Hughes | 2018-01-15 | 2 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project mr index path Closes #41341 See merge request gitlab-org/gitlab-ce!16399 | |||||
| * | | | | | | | | | | | Refactor dispatcher project mr index pathdispatcher-project-mr | Clement Ho | 2018-01-11 | 2 | -0/+21 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sh-log-when-user-blocked' into 'master' | Douwe Maan | 2018-01-15 | 8 | -4/+140 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log and send a system hook if a blocked user attempts to login Closes #41633 See merge request gitlab-org/gitlab-ce!16451 | |||||
| * | | | | | | | | | | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blocked | Stan Hu | 2018-01-14 | 8 | -4/+140 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41633 | |||||
* | | | | | | | | | | | Merge branch 'dispatcher-branches-create' into 'master' | Phil Hughes | 2018-01-15 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project branches create path See merge request gitlab-org/gitlab-ce!16380 | |||||
| * | | | | | | | | | | | Remove unused create index.jsdispatcher-branches-create | Clement Ho | 2018-01-12 | 1 | -3/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix eslint so that pipeline doesnt fail after mege | Clement Ho | 2018-01-11 | 1 | -1/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' into dispatcher-branches-create | Clement Ho | 2018-01-11 | 403 | -2024/+4627 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Refactor dispatcher project branches create path | Clement Ho | 2018-01-11 | 3 | -1/+13 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'patch-28' into 'master' | Grzegorz Bizon | 2018-01-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve after_script docs in yaml/README.md See merge request gitlab-org/gitlab-ce!16444 | |||||
| * | | | | | | | | | | | | | Improve after_script docs in yaml/README.md | Damian Nowak | 2018-01-13 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master' | Grzegorz Bizon | 2018-01-15 | 7 | -86/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#can_be_merged? to Gitaly Closes gitaly#893 See merge request gitlab-org/gitlab-ce!16316 | |||||
| * | | | | | | | | | | | | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly | Ahmad Sherif | 2018-01-11 | 7 | -86/+147 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ↵ | Annabel Dunstone Gray | 2018-01-12 | 8 | -56/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Use toggle for subscribed/unsubscribed to notifications" Closes #16988 See merge request gitlab-org/gitlab-ce!16408 | |||||
| * | | | | | | | | | | | | | change loading prop behavior for subscriptions.vue | Mike Greiling | 2018-01-12 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | add missing comma | Mike Greiling | 2018-01-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | only show loading indicator in subscription toggle on initial data fetch16988-use-toggle-for-subscribed-unsubscribed-to-notifications | Mike Greiling | 2018-01-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | add tooltip for notifications icon in collapsed sidebar | Mike Greiling | 2018-01-12 | 1 | -9/+29 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | change notification bell icon from font-awesome to gitlab svg | Mike Greiling | 2018-01-12 | 1 | -8/+10 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | update capybara specs for subscription toggle | Mike Greiling | 2018-01-12 | 2 | -16/+14 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | update spinach test for subscription toggle | Mike Greiling | 2018-01-12 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | update karma tests | Mike Greiling | 2018-01-12 | 2 | -7/+7 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | add prop defaults | Mike Greiling | 2018-01-12 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | change rss icon to bell icon for notifications | Mike Greiling | 2018-01-11 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | convert notification subscription button into toggle | Mike Greiling | 2018-01-11 | 3 | -22/+11 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rename-prometheus-to-monitoring' into 'master' | Stan Hu | 2018-01-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ~Prometheus to ~Monitoring See merge request gitlab-org/gitlab-ce!16442 | |||||
| * | | | | | | | | | | | | | | Rename ~Prometheus to ~Monitoring | Fabio Busatto | 2018-01-12 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'fix_gitlab-ce#41891' into 'master' | Annabel Dunstone Gray | 2018-01-12 | 3 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix gitlab-org/gitlab-ce#41891 (design nitpick) Closes #41891 See merge request gitlab-org/gitlab-ce!16383 | |||||
| * | | | | | | | | | | | | | | remove wrong/unneeded margin of custom navigation header logo without logo text | Markus Doits | 2018-01-12 | 3 | -3/+13 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'display-mr-in-commit-page' into 'master' | Clement Ho | 2018-01-12 | 15 | -2/+256 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display related merge requests in commit detail page Closes #2383 See merge request gitlab-org/gitlab-ce!13713 | |||||
| * | | | | | | | | | | | | | | | Display related merge requests in commit detail page | Hiroyuki Sato | 2018-01-12 | 15 | -2/+256 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'projects-l' into 'master' | Filipa Lacerda | 2018-01-12 | 5 | -2/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor projects:l* See merge request gitlab-org/gitlab-ce!16393 | |||||
| * | | | | | | | | | | | | | | | Refactor into init_labelsprojects-l | Clement Ho | 2018-01-12 | 2 | -17/+20 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into projects-l | Clement Ho | 2018-01-11 | 222 | -1462/+2749 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Code improvements | Clement Ho | 2018-01-11 | 4 | -11/+8 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Refactor projects:l* | Jacob Schatz | 2018-01-11 | 4 | -2/+41 | |
| | | | | | | | | | | | | | | | |