summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-261-3/+7
|\
| * Add path attribute to WikiFile classAhmad Sherif2017-10-261-3/+7
* | Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-10-261-13/+15
|\ \
| * | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-251-13/+15
| |/
* | Merge branch 'non-existing-repo-optimization' into 'master'Douwe Maan2017-10-261-6/+28
|\ \
| * | Avoid calling underlying methods on non-existing reposnon-existing-repo-optimizationAlejandro Rodríguez2017-10-201-6/+28
* | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-263-0/+18
|\ \ \
| * | | Update factories for git push serviceapi-configure-jiraRobert Schilling2017-10-241-0/+2
| * | | Factories need to set required attributesRobert Schilling2017-10-241-0/+2
| * | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-241-0/+14
* | | | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-256-0/+203
| |_|/ |/| |
* | | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-254-27/+32
|\ \ \
| * | | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-194-27/+32
| | |/ | |/|
* | | Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-251-0/+54
|\ \ \
| * | | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-241-0/+54
| |/ /
* | | Merge branch '35199-case-insensitive-branches-search' into 'master'Sean McGivern2017-10-251-0/+9
|\ \ \
| * | | Add case insensitive branches searchGeorge Andrinopoulos2017-10-231-0/+9
* | | | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-243-17/+21
|\ \ \ \
| * | | | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-233-17/+21
| | |_|/ | |/| |
* | | | Merge branch 'sh-memoize-logger' into 'master'Nick Thomas2017-10-241-0/+12
|\ \ \ \
| * | | | Memoize GitLab logger to reduce open file descriptorsStan Hu2017-10-241-0/+12
| |/ / /
* | | | Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-241-0/+10
|\ \ \ \
| * | | | Fix the writing of invalid environment refssh-fix-environment-write-refStan Hu2017-10-231-0/+10
* | | | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-242-0/+463
|\ \ \ \ \
| * | | | | Add pages domains API testsTravis Miller2017-10-221-0/+440
| * | | | | Add pages domains API schemaTravis Miller2017-10-221-0/+23
* | | | | | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-244-169/+133
|\ \ \ \ \ \
| * | | | | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-2/+13
| * | | | | | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-232-1/+27
| * | | | | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-232-178/+94
| * | | | | | Allow configuring new circuitbreaker settings from the UI and APIBob Van Landuyt2017-10-231-1/+12
* | | | | | | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-247-20/+363
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-234-0/+263
| |\ \ \ \ \ \
| * | | | | | | spec fixesPhil Hughes2017-10-233-138/+145
| * | | | | | | added feature specPhil Hughes2017-10-233-0/+99
| * | | | | | | fixed failing title testPhil Hughes2017-10-231-0/+1
| * | | | | | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-231-1/+1
| * | | | | | | failing spec fixesPhil Hughes2017-10-231-17/+11
| * | | | | | | correctly creates file in currently viewed directoryPhil Hughes2017-10-233-3/+245
* | | | | | | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-235-9/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-232-0/+4
| * | | | | | | | Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-2334-189/+340
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Fix failing testsFilipa Lacerda2017-10-192-2/+0
| * | | | | | | | Make pipelines table in MR view usableFilipa Lacerda2017-10-181-7/+16
* | | | | | | | | Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' i...Rémy Coutable2017-10-23178-2658/+2658
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-20178-2658/+2658
* | | | | | | | | | Merge branch 'backort_routes_group_routes_from_ee' into 'master'Douwe Maan2017-10-231-9/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport EE changes to group routesbackort_routes_group_routes_from_eeValery Sizov2017-10-221-9/+3
* | | | | | | | | | | Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-231-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-221-1/+0
| | |/ / / / / / / / | |/| | | | | | | |
View Lorry Controller Status