summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a changelog entrysh-fix-issue-31215-2Lin Jen-Shin2017-04-211-0/+4
|
* Also test against external-issue for deleted projectsLin Jen-Shin2017-04-211-5/+17
| | | | | | This is based on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10841
* Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215Lin Jen-Shin2017-04-21276-1156/+4021
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (109 commits) Update CI templates to include 9.1 templates Change spec folder to match the assets one Update style_guide_js.md Milestones documentation refactor Adds documentation entry: Don't user forEach, aim for code without side effects Move kube namespace section to the variables one Changed milestone.to_reference calls into milestone.title for the show, edit and top views Update move icon to match others Issue Title Show Focus Check On Load Update Kubernetes namespace documentation Store projects in metrics for email replies Refactor into .vue files Adds vue js example application and documentation Add ES lint support to identify poorly written Promises Update plantuml.md to add the actual link. Fixed wording Add metrics events for incoming emails Remove helpers assigned_issuables_count and cached_assigned_issuables_count Refactor into .vue files part 2 Fix headings ...
| * Merge branch 'vue-pipelines-folder' into 'master' Phil Hughes2017-04-2111-0/+0
| |\ | | | | | | | | | | | | Change spec folder to match the assets one See merge request !10834
| | * Change spec folder to match the assets onevue-pipelines-folderFilipa Lacerda2017-04-2011-0/+0
| | |
| * | Merge branch 'zj-update-ci-templates' into 'master' Kamil Trzciński2017-04-203-8/+86
| |\ \ | | | | | | | | | | | | | | | | Update CI templates to include 9.1 templates See merge request !10807
| | * | Update CI templates to include 9.1 templatesZeger-Jan van de Weg2017-04-203-8/+86
| |/ /
| * | Merge branch 'fe-doc-update' into 'master' Filipa Lacerda2017-04-201-0/+10
| |\ \ | | |/ | |/| | | | | | | Add parameter limit to styleguide See merge request !10830
| | * Update style_guide_js.mdfe-doc-updateFatih Acet2017-04-201-0/+10
| |/
| * Merge branch 'no-downtime-check-stable' into 'master' Robert Speicher2017-04-201-1/+7
| |\ | | | | | | | | | | | | Don't run the downtime check on stable branches, or tags/master See merge request !10794
| | * Don't run the downtime check on stable branches, or tags/masterno-downtime-check-stableDJ Mountney2017-04-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | The way the check currently works, it runs on the diff between your branch and the latest commit in gitlab on master. This doesn't give a good representation of the changes migrations for stable branches, tags, and master itself.
| * | Merge branch 'kubernetes-service-namespace' into 'master' Achilleas Pipinellis2017-04-201-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Kubernetes service namespace Closes #30445 See merge request !10821
| | * | Move kube namespace section to the variables oneAchilleas Pipinellis2017-04-201-9/+6
| | | |
| | * | Update Kubernetes namespace documentationkubernetes-service-namespaceKamil Trzcinski2017-04-201-0/+7
| | | |
| * | | Merge branch 'docs/milestones-refactor' into 'master' Achilleas Pipinellis2017-04-209-31/+53
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Milestones documentation refactor See merge request !10812
| | * | | Milestones documentation refactorAchilleas Pipinellis2017-04-209-31/+53
| |/ / /
| * | | Merge branch 'doc-js-side-effetcs' into 'master' Phil Hughes2017-04-201-0/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Adds documentation entry: Don't user forEach, aim for code without side effects See merge request !10811
| | * | | Adds documentation entry: Don't user forEach, aim for code without side effectsFilipa Lacerda2017-04-201-0/+17
| |/ / /
| * | | Merge branch '31116-moved-icon-update' into 'master' Phil Hughes2017-04-201-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update move icon to match others Closes #31116 See merge request !10790
| | * | | Update move icon to match others31116-moved-icon-updateAnnabel Dunstone Gray2017-04-201-1/+1
| | | | |
| * | | | Merge branch 'milestone-not-showing-correctly-title' into 'master' Annabel Dunstone Gray2017-04-203-2/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Changed milestone.to_reference calls into milestone.title for the show, edit and top views See merge request !10637
| | * | | | Changed milestone.to_reference calls into milestone.title for the show, edit ↵Jose Ivan Vargas Lopez2017-04-203-2/+6
| |/ / / / | | | | | | | | | | | | | | | and top views
| * | | | Merge branch 'docs-tech-articles-filetree' into 'master' Sean Packham (GitLab)2017-04-203-5/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs tech articles filetree Closes #30946 See merge request !10752
| | * | | | fix relative urlsdocs-tech-articles-filetreeMarcia Ramos2017-04-171-5/+5
| | | | | |
| | * | | | link articles list from writing docs pagesMarcia Ramos2017-04-171-1/+1
| | | | | |
| | * | | | add directory `articles` to hold all tech articlesMarcia Ramos2017-04-173-5/+22
| | | | | |
| * | | | | Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-2013-248/+200
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code that creates and destroys project/group members See merge request !10735
| | * | | | | Move some project/group members spinach tests to rspecdz-refactor-create-membersDmitriy Zaporozhets2017-04-176-194/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Refactor members controller destroy actionDmitriy Zaporozhets2017-04-174-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-177-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'add-email-receiver-metrics' into 'master' Douwe Maan2017-04-204-4/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add email receiver metrics See merge request !10814
| | * | | | | | Store projects in metrics for email repliesSean McGivern2017-04-202-4/+4
| | | | | | | |
| | * | | | | | Add metrics events for incoming emailsSean McGivern2017-04-202-0/+8
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This lets us track how many incoming emails a GitLab instance is processing, by email type (handler) and by project (where applicable).
| * | | | | | Merge branch 'issue-title-onfocus-load' into 'master' Filipa Lacerda2017-04-201-12/+11
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Issue Title Show Focus Check On Load See merge request !10800
| | * | | | | Issue Title Show Focus Check On LoadRegis Boudinot2017-04-201-12/+11
| |/ / / / /
| * | | | | Merge branch 'uassign_on_member_removing' into 'master' Sean McGivern2017-04-2011-29/+96
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unassign all Issues and Merge Requests when member leaves a team Closes #30768 and #24117 See merge request !10755
| | * | | | | Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removingValery Sizov2017-04-209-27/+25
| | | | | | |
| | * | | | | Remove assigned_(issues|merge_requests) methods from the issuableValery Sizov2017-04-184-10/+4
| | | | | | |
| | * | | | | Using IssuablesFinder(s) for UI countersValery Sizov2017-04-181-1/+2
| | | | | | |
| | * | | | | Update permission docs. Add note about automatic unassigning when member ↵Valery Sizov2017-04-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | leaves a team
| | * | | | | update chnagelogValery Sizov2017-04-181-0/+4
| | | | | | |
| | * | | | | Unassign all Issues and Merge Requests when member leaves teamValery Sizov2017-04-182-1/+68
| | | | | | |
| * | | | | | Merge branch '31154-fix-plantuml-link-in-documentation' into 'master' Sean McGivern2017-04-201-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update plantuml.md to fix wrong introduced in link. Closes #31154 See merge request !10806
| | * | | | | | Update plantuml.md to add the actual link.Sascha Reynolds2017-04-201-0/+2
| | | | | | | |
| | * | | | | | Update plantuml.md to fix wrong introduced in link.Sascha Reynolds2017-04-191-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'rollback-component-vue' into 'master' Phil Hughes2017-04-206-50/+58
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor into .vue files See merge request !10788
| | * | | | | | | Refactor into .vue filesFilipa Lacerda2017-04-206-50/+58
| |/ / / / / / /
| * | | | | | | Merge branch 'user-cohort-better-doc' into 'master' Sean McGivern2017-04-201-7/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for inactive users in the User cohort Closes #31195 See merge request !10809
| | * | | | | | | Fixed wordinguser-cohort-better-docRegis Freyd2017-04-201-1/+1
| | | | | | | | |
| | * | | | | | | Fix headingsRegis Freyd2017-04-201-3/+6
| | | | | | | | |