summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add dispatch mock to the test helpervuex-action-helper-correctly-failFilipa Lacerda2018-03-293-12/+62
* fixed failinng tests after helper changePhil Hughes2018-03-293-101/+185
* Use `toEqual` for the matchersFilipa Lacerda2018-03-291-3/+3
* Correctly fail Vuex action helperPhil Hughes2018-03-291-1/+1
* Merge branch 'workhorse-still-needs-repopath' into 'master'Sean McGivern2018-03-292-10/+12
|\
| * Gitlab-workhorse still needs RepoPath on Git HTTPJacob Vosmaer (GitLab)2018-03-292-10/+12
|/
* Merge branch 'group-rspec' into 'master'Rémy Coutable2018-03-298-234/+133
|\
| * Replace group spinach tests with RSpec analogSemyon Pupkov2018-03-298-234/+133
* | Merge branch 'sh-bump-rugged-0.27-0' into 'master'Douwe Maan2018-03-292-3/+3
|\ \
| * | Bump Rugged to 0.27.0sh-bump-rugged-0.27-0Stan Hu2018-03-282-3/+3
* | | Merge branch 'sh-promote-timecop-gemfile' into 'master'Rémy Coutable2018-03-291-1/+2
|\ \ \
| * | | Promote Timecop gem into joint test/development Bundler groupsh-promote-timecop-gemfileStan Hu2018-03-281-1/+2
| |/ /
* | | Merge branch '44717-no-resolve-issue' into 'master'Fatih Acet2018-03-283-7/+22
|\ \ \
| * | | Don't show Jump to Discussion button on issue notes44717-no-resolve-issueSimon Knox2018-03-283-7/+22
* | | | Merge branch 'docs-replace-libre-w-core' into 'master'Marcia Ramos2018-03-283-6/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Replaces "Libre" => "Core"docs-replace-libre-w-coreMarcia Ramos2018-03-283-6/+6
* | | | Merge branch 'min-is-better' into 'master'Mike Greiling2018-03-282-2/+2
|\ \ \ \
| * | | | Use katex min cssClement Ho2018-03-282-2/+2
|/ / / /
* | | | Merge branch 'bw-qa-rspec-options' into 'master'Grzegorz Bizon2018-03-285-12/+12
|\ \ \ \
| * | | | allow rspec files/options to be passed down in all casesBrett Walker2018-03-285-12/+12
* | | | | Merge branch '44752-remove-ee-specific-comments' into 'master'Rémy Coutable2018-03-286-19/+22
|\ \ \ \ \
| * | | | | Remove EE-specific comments from CE44752-remove-ee-specific-commentsEric Eastwood2018-03-286-19/+22
* | | | | | Merge branch 'contribute/registry-after-cicd' into 'master'Filipa Lacerda2018-03-282-8/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Move 'Registry' after 'CI/CD' in project navigation sidebarElias Werberich2018-03-272-8/+13
* | | | | | Merge branch 'ide-file-row-hover-style' into 'master'Filipa Lacerda2018-03-283-6/+19
|\ \ \ \ \ \
| * | | | | | made active file the current theme colorPhil Hughes2018-03-282-4/+9
| * | | | | | reverted blur listenerPhil Hughes2018-03-281-39/+40
| * | | | | | Added row hover styles to IDE file listPhil Hughes2018-03-283-42/+49
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'bump-omniauth-google-oauth2-gem-version' into 'master'Douwe Maan2018-03-282-8/+7
|\ \ \ \ \ \
| * | | | | | Bumps omniauth google oauth2 gem versionbump-omniauth-google-oauth2-gem-versionTiago Botelho2018-03-282-8/+7
* | | | | | | Merge branch '44657-reuse-root_ref_hash-on-branches' into 'master'Rémy Coutable2018-03-283-12/+13
|\ \ \ \ \ \ \
| * | | | | | | Reuse root_ref_hash for performance on BranchesTakuya Noguchi2018-03-283-12/+13
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'docs-fix_code_quality_example_documentation' into 'master'Achilleas Pipinellis2018-03-281-6/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix code quality example documentationOlivier Gonzalez2018-03-281-6/+1
* | | | | | | | Merge branch '44508-fix-fork-namespace-images' into 'master'Rémy Coutable2018-03-282-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug rendering group icons when forkingMark Fletcher2018-03-282-1/+6
* | | | | | | | | Merge branch '44392-resolve-projects-creation-silently-failing-on-after-creat...Douwe Maan2018-03-285-12/+49
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | When a Service templates are invalid newly created projects will have them in...Tiago Botelho2018-03-284-8/+27
| * | | | | | | | Project creation does not fail silently on DB related changesTiago Botelho2018-03-273-8/+26
* | | | | | | | | Merge branch 'docs-fe-js' into 'master'Tim Zallmann2018-03-281-1/+193
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add JavaScript style guideClement Ho2018-03-281-1/+193
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-extract-ee-api' into 'master'Rémy Coutable2018-03-281-0/+249
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify what rules we should follow for namingdocs-extract-ee-apiLin Jen-Shin2018-03-261-2/+3
| * | | | | | | | | Copyedit doc/development/ee_features.mdRobert Speicher2018-03-231-36/+35
| * | | | | | | | | Document a few strategies to extract EE APIsLin Jen-Shin2018-03-071-0/+249
* | | | | | | | | | Merge branch 'expose-commits-mr-api' into 'master'Rémy Coutable2018-03-284-0/+116
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Allow merge requests related to a commit to be found via APIMark Fletcher2018-03-264-0/+116
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into 'ma...Douwe Maan2018-03-283-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix auto-linking with escaped HTML entitiesSean McGivern2018-03-283-2/+20
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-workhorse-test' into 'master'Sean McGivern2018-03-285-10/+18
|\ \ \ \ \ \ \ \ \