summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport FileFinder from EEbackport_file_filder_from_eeValery Sizov2017-05-124-18/+55
* Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1056-311/+831
|\
| * Use new SnippetsFinder signature in APIbvl-security-patchesBob Van Landuyt2017-05-101-2/+2
| * Use `described_class` in SnippetsFinder-specBob Van Landuyt2017-05-101-21/+21
| * Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-108-19/+105
| * Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-105-3/+29
| * Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-1023-184/+399
| * Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-101-0/+4
| * Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-103-3/+80
| * Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-104-12/+39
| * Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-103-16/+46
| * Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-104-56/+86
| * Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-107-17/+42
* | Merge branch '31474-issue-boards-sidebar-milestone-dropdown-should-not-be-mul...Phil Hughes2017-05-107-13/+97
|\ \
| * | Disallow multiselect for Milestone dropdownSam Rose2017-05-107-13/+97
* | | Merge branch 'tc-clean-pending-delete-projects' into 'master' Douwe Maan2017-05-106-0/+206
|\ \ \
| * | | No user needed to cleanup namespaceless pending delete projectsToon Claes2017-05-104-21/+21
| * | | Use worker to destroy namespaceless projects in post-deployToon Claes2017-05-107-116/+202
| * | | No user is needed to delete a projectToon Claes2017-05-101-4/+1
| * | | Add post-deploy migrate to cleanup projects in pending delete stateToon Claes2017-05-103-0/+123
* | | | Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master' Filipa Lacerda2017-05-101-1/+1
|\ \ \ \
| * | | | Fixed the stage title translation in cycle analyticsPhil Hughes2017-05-101-1/+1
* | | | | Merge branch '30949-empty-states' into 'master' Phil Hughes2017-05-106-28/+13
|\ \ \ \ \
| * | | | | Center all empty statesAnnabel Dunstone Gray2017-05-106-28/+13
|/ / / / /
* | | | | Merge branch 'center-related-merge-request-items-horizontally' into 'master' Filipa Lacerda2017-05-101-1/+9
|\ \ \ \ \
| * | | | | Added @annabeldunstone vertical-align fixcenter-related-merge-request-items-horizontallyLuke "Jared" Bennett2017-05-101-0/+8
| * | | | | Remove related issue ci icon top marginLuke "Jared" Bennett2017-05-091-1/+0
| * | | | | Center related merge request items horizontallyLuke "Jared" Bennett2017-05-081-0/+1
* | | | | | Merge branch 'dm-discussion-diff-header-toggle' into 'master' Douwe Maan2017-05-102-2/+6
|\ \ \ \ \ \
| * | | | | | Remove unused toggle from diff discussion diff headersdm-discussion-diff-header-toggleDouwe Maan2017-05-092-2/+6
* | | | | | | Merge branch 'dm-async-tree-readme' into 'master' Douwe Maan2017-05-1015-16/+42
|\ \ \ \ \ \ \
| * | | | | | | Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-1015-16/+42
| |/ / / / / /
* | | | | | | Merge branch 'remove-old-isobject' into 'master' Phil Hughes2017-05-1011-47/+18
|\ \ \ \ \ \ \
| * | | | | | | Replace old isObject for underscore methodsFilipa Lacerda2017-05-1011-47/+18
|/ / / / / / /
* | | | | | | Merge branch '30286-vue-loadin-icon' into 'master' Phil Hughes2017-05-1020-105/+187
|\ \ \ \ \ \ \
| * | | | | | | Tech debt: Creates vue component for loading iconFilipa Lacerda2017-05-1020-105/+187
|/ / / / / / /
* | | | | | | Merge branch '31554-update-rufus-scheduler-and-sidekiq' into 'master' Rémy Coutable2017-05-105-9/+34
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from...Dosuken shinya2017-05-105-9/+34
|/ / / / / / /
* | | | | | | Merge branch '32077-pipeline-graph-margins' into 'master' Phil Hughes2017-05-101-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix broken margin in pipeline graphFilipa Lacerda2017-05-101-5/+5
|/ / / / / / /
* | | | | | | Merge branch 'fix-reassigned-mr-email' into 'master' Douwe Maan2017-05-102-19/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix reassigned MR emailfix-reassigned-mr-emailSean McGivern2017-05-102-19/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'feature/print-go-version-in-env-info' into 'master' Sean McGivern2017-05-102-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-infoAhmad Sherif2017-05-102-0/+7
| |/ / / / / /
* | | | | | | Merge branch 'fix-sidebar_spec-assignee-edit-transient-failure' into 'master' Sean McGivern2017-05-101-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Find dropdown-menu before asserting active item in sidebar_spec.rbfix-sidebar_spec-assignee-edit-transient-failureLuke "Jared" Bennett2017-05-101-2/+2
* | | | | | | Merge branch 'search-restrict-projects-to-group' into 'master' Filipa Lacerda2017-05-104-9/+50
|\ \ \ \ \ \ \
| * | | | | | | Filter projects by group on search pagesearch-restrict-projects-to-groupPhil Hughes2017-05-084-9/+50
* | | | | | | | Merge branch 'fix-search-not-highlighting' into 'master' Filipa Lacerda2017-05-103-10/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed search terms not highlightPhil Hughes2017-05-103-10/+47
| | |_|_|_|_|/ / | |/| | | | | |