summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-252-95/+0
* Merge branch 'internal_recovery_api' into 'master' Robert Speicher2016-08-241-0/+62
|\
| * Add two factor recovery endpoint to internal APIDrew Blessing2016-08-241-0/+62
* | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-241-0/+27
|\ \ | |/ |/|
| * Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-241-0/+27
* | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-1/+142
|\ \
| * | Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-241-10/+13
| * | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-1/+139
* | | Merge branch 'restore-get_id' into 'master' Douwe Maan2016-08-241-0/+10
|\ \ \
| * | | Add failing test for #21334winniehell2016-08-241-0/+10
| |/ /
* | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' Douwe Maan2016-08-242-2/+28
|\ \ \
| * | | expose 'only_allow_merge_if_build_succeeds' project setting in the APIMarc Dequènes (Duck)2016-08-242-2/+28
| |/ /
* | | Merge branch 'entity-api-web-url' into 'master' Douwe Maan2016-08-243-0/+3
|\ \ \ | |_|/ |/| |
| * | api: expose web_url for project entitiesBen Boeckel2016-08-243-0/+3
| |/
* | Merge branch 'api-project-hook-wiki-page-events' into 'master' Robert Speicher2016-08-242-0/+9
|\ \
| * | api: expose wiki_page_events project hook field in the APIBen Boeckel2016-08-242-0/+5
| * | docs: document other project webhook fieldsBen Boeckel2016-08-241-0/+4
| |/
* | Show "Create Merge Request" widget for push events to fork projects on the so...Paco Guzman2016-08-242-0/+48
|/
* Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' Douwe Maan2016-08-231-2/+48
|\
| * Added unfold test to parallel and added 'diff discussion' contextLuke Bennett2016-08-231-2/+33
| * Better first match on this MR alsoLuke Bennett2016-08-231-1/+1
| * Updated to optimized specs from !5864Luke Bennett2016-08-231-138/+0
| * Added 'with an unfolded line should not allow commenting' scenario (line 125)Luke Bennett2016-08-231-0/+153
* | Merge branch 'fix-file-links-on-project-page' into 'master' Douwe Maan2016-08-231-0/+29
|\ \
| * | Fix file links on project page Files viewfix-file-links-on-project-pageSean McGivern2016-08-231-0/+29
* | | Merge branch 'fix-impersonation-log' into 'master' Robert Speicher2016-08-231-0/+2
|\ \ \ | |_|/ |/| |
| * | Fix incorrect "stopped impersonation" log messagefix-impersonation-logStan Hu2016-08-231-0/+2
| |/
* | Fixed enter key in search input not workingPhil Hughes2016-08-231-0/+10
|/
* Merge branch 'revert_revert_issuable_lock' into 'master' Douwe Maan2016-08-232-0/+22
|\
| * Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-222-0/+22
* | Merge branch 'tests-for-diff-notes' into 'master' Stan Hu2016-08-221-0/+161
|\ \
| * | Fixed timing issue with selecting parallel or inline view typestests-for-diff-notesLuke Bennett2016-08-221-5/+3
| * | Replaced all `first` with `match:` equivalentsLuke Bennett2016-08-211-0/+163
| |/
* | Merge branch 'fix/coverage-report-merge-time' into 'master' Robert Speicher2016-08-221-1/+2
|\ \
| * | Bump SimpleCov merge timeout to 365 daysfix/coverage-report-merge-timeGrzegorz Bizon2016-08-221-1/+2
| |/
* | Merge branch 'metrics-typo' into 'master' Yorick Peterse2016-08-221-1/+1
|\ \ | |/ |/|
| * Fix typo in gitlab-workhorse headerJacob Vosmaer2016-08-191-1/+1
* | Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+12
* | Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-201-9/+10
* | Add spec for Ability.project_abilitiesStan Hu2016-08-201-0/+63
* | Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-202-69/+73
|\ \
| * | Move protected branches access control spec into a shared example.Timothy Andrew2016-08-202-69/+73
* | | Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-203-3/+3
|\ \ \
| * | | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-193-3/+3
* | | | Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-192-0/+137
|\ \ \ \
| * | | | Todos sorting dropdownissue_18135Felipe Artur2016-08-192-0/+137
* | | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-192-1/+22
|\ \ \ \ \
| * | | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-192-1/+22
| | |_|/ / | |/| | |
* | | | | Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' i...Jacob Schatz2016-08-193-4/+139
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed conflictsLuke Bennett2016-08-181-2/+2
View Lorry Controller Status