summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* modify tests to see more than one element since we render the label itself now24685_view_selfRegis2017-08-072-13/+18
* fix haml lintRegis2017-08-071-2/+2
* Merge branch 'master' into 24685_view_selfRegis2017-08-041174-7682/+9711
|\
| * Merge branch '35275-change-issue-icon' into 'master'feature/migrate-last-commit-for-path-to-gitalyPhil Hughes2017-08-045-5/+13
| |\
| | * Update top bar issues iconAnnabel Dunstone Gray2017-08-045-5/+13
| |/
| * Merge branch 'fix-pipeline-icon-contextual-nav' into 'master'Annabel Dunstone Gray2017-08-041-2/+2
| |\
| | * Fix pipeline icon in contextual nav for projectstauriedavis2017-08-041-2/+2
| * | Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-0410-239/+293
| |\ \ | | |/ | |/|
| | * fixed up specsPhil Hughes2017-07-284-55/+71
| | * trying to fix teststauriedavis2017-07-282-3/+14
| | * fix merge conflictstauriedavis2017-07-281-215/+215
| | * css fixestauriedavis2017-07-282-58/+63
| | * try and fix some teststauriedavis2017-07-283-6/+16
| | * 34060 Simply general project settings to use expanded panelstauriedavis2017-07-285-190/+202
| * | Merge branch 'do-not-test-mysql-in-ee-non-master-or-stable' into 'master'Rémy Coutable2017-08-041-5/+7
| |\ \
| | * | Since mysql is not a priority anymore, test it lessdo-not-test-mysql-in-ee-non-master-or-stableLin Jen-Shin2017-08-041-5/+7
| * | | Merge branch 'source-install-yarn-2' into 'master'Mike Greiling2017-08-046-7/+24
| |\ \ \
| | * | | Install yarn via apt in update guidesJacob Vosmaer2017-08-045-5/+20
| | * | | Use long curl optionsJacob Vosmaer2017-08-041-1/+1
| | * | | Install 'yarn' globally to avoid PATH issuesJacob Vosmaer2017-08-031-2/+4
| * | | | Merge branch 'winh-new-dropdown-dividers' into 'master'Annabel Dunstone Gray2017-08-042-0/+8
| |\ \ \ \
| | * | | | Make new dropdown dividers full widthwinh-new-dropdown-dividerswinh2017-08-042-0/+8
| * | | | | Merge branch '35944-missing-sidebar-icons' into 'master'Phil Hughes2017-08-044-2/+4
| |\ \ \ \ \
| | * | | | | Add container registry and spam logs iconsAnnabel Dunstone Gray2017-08-044-2/+4
| * | | | | | Merge branch 'tc-fix-mr-query-params' into 'master'Rémy Coutable2017-08-041-0/+20
| |\ \ \ \ \ \
| | * | | | | | Add spec to test combining API merge_requests query parametersToon Claes2017-08-031-0/+20
| * | | | | | | Merge branch '2902-standalone-ee-dir-ce' into 'master'Rémy Coutable2017-08-046-33/+53
| |\ \ \ \ \ \ \
| | * | | | | | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-046-33/+53
| * | | | | | | | Merge branch 'revert-6291bc8c' into 'master'Rémy Coutable2017-08-041-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"revert-6291bc8cRobert Speicher2017-08-031-1/+0
| * | | | | | | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-044-15/+78
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-037-27/+90
| * | | | | | | | | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-046-63/+96
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-037-64/+97
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '35948-active-settings-pipelines' into 'master'Phil Hughes2017-08-041-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add active state for pipelines settings on old nav35948-active-settings-pipelinesAnnabel Dunstone Gray2017-08-031-1/+1
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '35659-rename-pipeline' into 'master'Annabel Dunstone Gray2017-08-043-6/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 35659 Rename Pipelines tab to CI / CD in new navigation35659-rename-pipelinetauriedavis2017-08-033-6/+10
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '32388-validate-and-document-openshift-support' into 'master'Achilleas Pipinellis2017-08-0417-1/+511
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Fix different Markdown stylesAchilleas Pipinellis2017-08-042-28/+4
| | * | | | | | | | Openshift Getting Started32388-validate-and-document-openshift-supportJoshua Lambert2017-08-0417-1/+535
| | |/ / / / / / /
| * | | | | | | | Merge branch 'rs-issue-35701' into 'master'Rémy Coutable2017-08-041-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Ensure DeviseHelpers is loaded before inclusion in LoginHelpersrs-issue-35701Robert Speicher2017-08-031-0/+2
| * | | | | | | | | Merge branch 'sh-bump-gitlab-shell-gitaly' into 'master'Stan Hu2017-08-042-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refssh-bump-gitlab-shell-gitalyStan Hu2017-08-042-2/+2
| |/ / / / / / / /
| * | | | | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-046-329/+389
| |\ \ \ \ \ \ \ \
| | * | | | | | | | another rubocop style fixrefactor.notification-recipient-buildershttp://jneen.net/2017-08-031-1/+1
| | * | | | | | | | rubocop style fixhttp://jneen.net/2017-08-031-1/+1
| | * | | | | | | | add a comment warning that note.project may be nilhttp://jneen.net/2017-08-031-0/+4
| | * | | | | | | | remove build_relabeled_recipientshttp://jneen.net/2017-08-032-20/+7