summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-081-0/+20
|\
| * Support pending invitation project members importing projectsJames Lopez2016-08-081-0/+20
* | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-081-0/+17
|\ \
| * | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-081-0/+17
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-086-33/+143
|\ \
| * | Wrap param with parens for consistencyAlfredo Sumaran2016-08-051-1/+1
| * | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-051-3/+3
| * | Update layout and JS for create protected branch.Alfredo Sumaran2016-08-051-4/+4
| |/
| * Merge branch 'date-time-to-day-tests' into 'master' Jacob Schatz2016-08-051-0/+31
| |\
| | * Added tests to dateTime utility getDayName methoddate-time-to-day-testsPhil Hughes2016-07-181-0/+31
| * | Merge branch 'ref-switcher-enter-submit' into 'master' Jacob Schatz2016-08-051-0/+29
| |\ \
| | * \ Merge branch 'master' into ref-switcher-enter-submitPhil Hughes2016-08-03199-4444/+7144
| | |\ \
| | * | | Added ref switcher enter key testsPhil Hughes2016-07-191-0/+29
| * | | | Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-051-2/+15
| |\ \ \ \
| | * | | | Update timeago to shorter representation19752-pipelines-finished-atAnnabel Dunstone2016-08-041-2/+15
| * | | | | Merge branch 'leading-slashes-relative-links' into 'master' Rémy Coutable2016-08-051-0/+5
| |\ \ \ \ \
| | * | | | | Add failing test for #7032winniehell2016-08-051-0/+5
| | |/ / / /
| * | | | | Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-051-24/+56
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-24/+56
* | | | | | Merge branch '14898-protected-branches-developer-can-not-push-without-permiss...Douwe Maan2016-08-052-12/+132
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | changes default_branch_protection to allow devs_can_merge protection option a...tiagonbotelho2016-08-042-50/+34
| * | | | | developer cannot push to protected branch when project is empty or he has not...tiagonbotelho2016-08-022-11/+147
* | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-08-041-0/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-041-0/+11
| |\ \ \ \ \ \
| | * | | | | | Don’t close issues on original project from a forkPaco Guzman2016-08-041-0/+11
* | | | | | | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-041-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-041-2/+2
* | | | | | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-0/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix specJames Lopez2016-08-041-1/+1
| * | | | | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-0/+64
* | | | | | | | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-042-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-032-2/+2
* | | | | | | | | Merge branch 'fix/import-error' into 'master' Rémy Coutable2016-08-041-0/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-031-0/+30
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix-project-destroy-skip-repo' into 'master' Robert Speicher2016-08-041-0/+24
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix skip_repo parameter being ignored when destroying a namespaceStan Hu2016-08-031-0/+24
* | | | | | | | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-032-8/+8
|/ / / / / / /
* | | | | | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-1/+1
* | | | | | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-0312-25/+129
* | | | | | | Introduce Compare model in the codebase.Paco Guzman2016-08-033-12/+17
* | | | | | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-036-19/+44
* | | | | | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-033-22/+23
|/ / / / / /
* | | | | | Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' Douwe Maan2016-08-022-3/+4
|\ \ \ \ \ \
| * | | | | | Tidy the key spec and fix failing user specKeith Pope2016-08-022-2/+2
| * | | | | | Add simple identifier to public SSH keysKeith Pope2016-08-021-2/+3
* | | | | | | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-022-113/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-012-46/+14
| * | | | | | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-012-68/+36
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-024-2/+47
|\ \ \ \ \ \
| * | | | | | Add failing test for #20462winniehell2016-08-024-2/+47
| |/ / / / /
View Lorry Controller Status