Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'projects-tree-tags-dispatcher-refactor' into 'master' | Phil Hughes | 2018-01-15 | 3 | -12/+31 |
|\ | | | | | | | | | Refactored import of projects:tags:* and projects:tree:* of dispatcher.js See merge request gitlab-org/gitlab-ce!16452 | ||||
| * | refactored use of for projects:tree:*projects-tree-tags-dispatcher-refactor | Constance Okoghenun | 2018-01-15 | 2 | -5/+3 |
| | | |||||
| * | Refactored import of projects:tags:* and projects:tree:* of dispatcher.js | Constance Okoghenun | 2018-01-15 | 3 | -12/+33 |
| | | |||||
* | | Merge branch '41856-backport-stacked-progress-bar' into 'master' | Phil Hughes | 2018-01-15 | 3 | -0/+182 |
|\ \ | | | | | | | | | | | | | | | | | | | Backport StackedProgressBar component from GitLab EE Closes #41856 See merge request gitlab-org/gitlab-ce!16457 | ||||
| * | | Add StackedProgressBar Component | Kushal Pandya | 2018-01-15 | 1 | -0/+1 |
| | | | |||||
| * | | StackedProgressBar Component styles | Kushal Pandya | 2018-01-15 | 1 | -0/+54 |
| | | | |||||
| * | | StackedProgressBar Component | Kushal Pandya | 2018-01-15 | 1 | -0/+127 |
| |/ | |||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2018-01-15 | 6 | -14/+61 |
|\ \ | | | | | | | | | | dispatcher-projects-efi | ||||
| * \ | 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 | 8 | -32/+84 |
| | |\ \ | |||||
| | * | | | 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 '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 | 67 | -305/+491 |
| | |\ \ \ | |||||
| | * | | | | Refactor dispatcher project branches create path | Clement Ho | 2018-01-11 | 3 | -1/+13 |
| | | | | | | |||||
* | | | | | | dedupe | Simon Knox | 2018-01-15 | 3 | -26/+20 |
| | | | | | | |||||
* | | | | | | 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 | 25 | -213/+298 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | dispatcher-projects-efi | ||||
| * | | | | | Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ↵ | Annabel Dunstone Gray | 2018-01-12 | 3 | -29/+46 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 karma tests | Mike Greiling | 2018-01-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | 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 'fix_gitlab-ce#41891' into 'master' | Annabel Dunstone Gray | 2018-01-12 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | Display related merge requests in commit detail page | Hiroyuki Sato | 2018-01-12 | 2 | -0/+75 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 8 | -32/+84 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | * | | | | | | | Code improvements | Clement Ho | 2018-01-11 | 4 | -11/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Refactor projects:l* | Jacob Schatz | 2018-01-11 | 4 | -2/+41 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch ↵ | Filipa Lacerda | 2018-01-12 | 6 | -133/+58 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-backport-generalize-protected-branch-tags-to-create-item-dropdown' into 'master' Generalize protected branch/tag dropdowns -- CE backport See merge request gitlab-org/gitlab-ce!16420 | ||||
| | * | | | | | | Generalize protected branch/tag dropdownsce-backport-generalize-protected-branch-tags-to-create-item-dropdown | Eric Eastwood | 2018-01-12 | 6 | -133/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate ee code This was generalized for usage in the new variable table design, see https://gitlab.com/gitlab-org/gitlab-ce/issues/39118#note_53615249 Conflicts: app/assets/stylesheets/pages/projects.scss ee/app/assets/javascripts/protected_branches/protected_branch_create.js ee/app/assets/javascripts/protected_tags/protected_tag_create.js ee/app/views/projects/protected_branches/ee/_dropdown.html.haml | ||||
| * | | | | | | | Merge branch 'projects-dropdown-perf' into 'master' | Filipa Lacerda | 2018-01-12 | 1 | -5/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed performance of projects dropdown Closes #41939 See merge request gitlab-org/gitlab-ce!16425 | ||||
| | * | | | | | | | Fixed performance of projects dropdownprojects-dropdown-perf | Phil Hughes | 2018-01-12 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41939 | ||||
| * | | | | | | | | Merge branch '41937-vue-prop-type' into 'master' | Phil Hughes | 2018-01-12 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix type is started key" Closes #41937 See merge request gitlab-org/gitlab-ce!16407 | ||||
| | * | | | | | | | | Fix boolean prop being provided as string41937-vue-prop-type | Filipa Lacerda | 2018-01-11 | 1 | -1/+5 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch '41797-prometheus-wording-fixes' into 'master' | Kamil Trzciński | 2018-01-12 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wording fixes on cluster page" Closes #41797 See merge request gitlab-org/gitlab-ce!16324 | ||||
| | * | | | | | | | | Fixes minor aspects on Prometheus description41797-prometheus-wording-fixes | Mayra Cabrera | 2018-01-11 | 1 | -2/+1 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change Gitlab to GitLab - Remove trailing space on GitLab Integration link |