summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move active to nav-link classsh-fix-login-active-tabsStan Hu2018-06-201-2/+2
* Merge branch 'master' into sh-fix-login-active-tabsClement Ho2018-06-20200-534/+1034
|\
| * Merge branch 'bvl-dont-generate-mo' into 'master'Rubén Dávila2018-06-202-1/+5
| |\
| | * Don't generate `.mo` filesBob Van Landuyt2018-06-202-1/+5
| * | Merge branch 'jr-48133-web-ide-commit-ellipsis' into 'master'Tim Zallmann2018-06-202-1/+6
| |\ \
| | * | Add ellipsis to Web IDE commit buttonjr-48133-web-ide-commit-ellipsisJames Ramsay2018-06-202-1/+6
| * | | Merge branch 'improve-scripts-trigger-build' into 'master'Robert Speicher2018-06-201-0/+4
| |\ \ \
| | * | | Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-buildRémy Coutable2018-06-201-0/+4
| * | | | Merge branch '48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-htt...Robert Speicher2018-06-202-2/+10
| |\ \ \ \
| | * | | | [QA] Fix qa/qa/specs/features/login/ldap_spec.rb48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964Rémy Coutable2018-06-202-2/+10
| * | | | | Merge branch 'unify-lib-tasks' into 'master'Robert Speicher2018-06-202-2/+2
| |\ \ \ \ \
| | * | | | | Unify flay.rake and gettext.rake from EEunify-lib-tasksLin Jen-Shin2018-06-212-2/+2
| * | | | | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into 'mas...Robert Speicher2018-06-209-70/+33
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commitsMark Chao2018-06-201-2/+5
| | * | | | | Notify only when unmergeable due to conflictMark Chao2018-06-208-68/+28
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'project_wiki_scenario_automation' into 'master'Rémy Coutable2018-06-2022-70/+314
| |\ \ \ \ \
| | * | | | | Added Wiki Scenario Automation gitlab-qa#263Ramya A2018-06-2022-70/+314
| |/ / / / /
| * | | | | Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into ...Mike Greiling2018-06-201-1/+1
| |\ \ \ \ \
| | * | | | | Fix navigation bar center logo for custom logosClement Ho2018-06-201-1/+1
| | |/ / / /
| * | | | | Merge branch 'rs-platform-feature-spec-parity' into 'master'Rémy Coutable2018-06-201-2/+7
| |\ \ \ \ \
| | * | | | | Make the stubbed methods for SAML authorize paths more specificrs-platform-feature-spec-parityRobert Speicher2018-06-191-2/+7
| * | | | | | Merge branch '6165-migrate-ee-specific-code' into 'master'Rémy Coutable2018-06-202-10/+55
| |\ \ \ \ \ \
| | * | | | | | Backport code from gitlab-ee!6182Lukas Eipert2018-06-202-10/+55
| |/ / / / / /
| * | | | | | Merge branch 'limit-metrics-content-type' into 'master'Stan Hu2018-06-203-3/+22
| |\ \ \ \ \ \
| | * | | | | | Limit the action suffixes in transaction metricslimit-metrics-content-typeYorick Peterse2018-06-203-3/+22
| * | | | | | | Merge branch 'remove-allocations-gem' into 'master'Stan Hu2018-06-208-29/+5
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Remove remaining traces of the Allocations Gemremove-allocations-gemYorick Peterse2018-06-208-29/+5
| | |/ / / / /
| * | | | | | Merge branch 'highlight-cluster-settings-message' into 'master'Rémy Coutable2018-06-202-2/+8
| |\ \ \ \ \ \
| | * | | | | | Highlight cluster settings messageGeorge Tsiolis2018-06-192-2/+8
| * | | | | | | Merge branch '48153-date-selection-dialog-broken-when-creating-a-new-mileston...Rémy Coutable2018-06-202-2/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Prevent browser autocomplete for milestone date fieldsMark Fletcher2018-06-202-2/+7
| * | | | | | | Merge branch 'leipert-eslint-report-unused-directives' into 'master'Mike Greiling2018-06-20100-130/+105
| |\ \ \ \ \ \ \
| | * | | | | | | ensure that `import/no-unresolved` does not trigger for our fixture filesleipert-eslint-report-unused-directivesLukas Eipert2018-06-205-8/+4
| | * | | | | | | remove all unused eslint-disable rulesLukas Eipert2018-06-2094-120/+99
| | * | | | | | | report unused disabled eslint directivesLukas Eipert2018-06-201-2/+2
| * | | | | | | | Merge branch 'revert-80044bda' into 'master'Clement Ho2018-06-202-6/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'"Clement Ho2018-06-202-6/+0
| * | | | | | | | Merge branch 'docs/48075-milestone-labels-can-be-confusing' into 'master'47964-custom-logo-rendering-improperly-on-sign-in-pageMek Stittri2018-06-201-5/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Resolve conflicts with latest workflow label changesMek Stittri2018-06-20138-804/+1210
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'bvl-errors-in-static-analysis' into 'master'Sean McGivern2018-06-202-13/+30
| |\ \ \ \ \ \ \ \
| | * | | | | | | | More verbose errors in static-analysisBob Van Landuyt2018-06-202-13/+30
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'zj-can-be-merged' into 'master'Douwe Maan2018-06-203-44/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move mergablility check to Gitalyzj-can-be-mergedZeger-Jan van de Weg2018-06-203-44/+21
| * | | | | | | | | Merge branch 'fix/favicon-cross-origin' into 'master'Douwe Maan2018-06-203-5/+35
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues w...Alexis Reigel2018-06-203-5/+35
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '47631-operations-kubernetes-option-is-always-visible-when-repos...Rémy Coutable2018-06-203-0/+44
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Operations and Kubernetes items are now omitted in the sidebar when repositor...47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabledTiago Botelho2018-06-203-0/+44
| * | | | | | | | | | Merge branch 'sh-bump-rugged-0.27.2' into 'master'Rémy Coutable2018-06-202-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Bump rugged to 0.27.2sh-bump-rugged-0.27.2Stan Hu2018-06-202-1/+6
| * | | | | | | | | | Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-w...Rémy Coutable2018-06-202-0/+12
| |\ \ \ \ \ \ \ \ \ \