summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-1413-43/+143
|\
| * Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-1313-43/+143
* | Handle case when BroadcastMessage.current is nilStan Hu2017-07-131-0/+11
* | Merge branch 'fix-issue-tracker-spec' into 'master'Rémy Coutable2017-07-131-18/+9
|\ \
| * | Prevent GitLab issue tracker spec from failing later specsfix-issue-tracker-specSean McGivern2017-07-131-18/+9
* | | Merge branch 'bvl-enable-features-in-test' into 'master'Rémy Coutable2017-07-135-2/+22
|\ \ \
| * | | Enable all feature flags by default in specsbvl-enable-features-in-testBob Van Landuyt2017-07-135-2/+22
| |/ /
* | | Merge branch 'lib-git-gitaly' into 'master'Sean McGivern2017-07-131-5/+5
|\ \ \ | |/ / |/| |
| * | Try to eliminate unused diff optionsJacob Vosmaer2017-07-121-5/+5
* | | Merge branch 'migrate-workhorse-send-blob-to-gitaly' into 'master'Robert Speicher2017-07-121-0/+38
|\ \ \
| * | | Migrate Workhorse SendBlob to GitalyAhmad Sherif2017-07-111-0/+38
* | | | Merge branch 'mr-branch-link-use-tree' into 'master'Robert Speicher2017-07-124-5/+46
|\ \ \ \
| * | | | Fix spec name grammermr-branch-link-use-treeClement Ho2017-07-121-3/+3
| * | | | Make commits behind text a link to the target branch commits pageClement Ho2017-07-114-4/+32
| * | | | Convert target branch link to use treeClement Ho2017-07-113-5/+5
| * | | | MR branch link now links to tree instead of commitsClement Ho2017-07-101-0/+13
| | |_|/ | |/| |
* | | | Update vue-resourceFilipa Lacerda2017-07-124-28/+51
* | | | Merge branch 'bugfix-htmlenc' into 'master'Sean McGivern2017-07-121-0/+12
|\ \ \ \
| * | | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-121-0/+12
| | |_|/ | |/| |
* | | | Merge branch 'replace_spinach_spec_browse_files' into 'master'Rémy Coutable2017-07-1211-57/+817
|\ \ \ \ | |/ / / |/| | |
| * | | Replace 'browse_files.feature' spinach test with an rspec analogblackst0ne2017-07-1211-57/+817
* | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-122-4/+38
|/ / /
* | | Merge branch 'rs-issue-34941' into 'master'Stan Hu2017-07-111-9/+13
|\ \ \
| * | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilientRobert Speicher2017-07-111-9/+13
* | | | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-111-0/+16
|\ \ \ \
| * | | | Use view=simple for simplifying merge requests APIStan Hu2017-07-111-1/+1
| * | | | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-111-0/+16
| |/ / /
* | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into '...Kamil Trzciński2017-07-111-127/+161
|\ \ \ \ | |/ / / |/| | |
| * | | Do not show pipeline schedule button for non-memberTakuya Noguchi2017-07-111-127/+161
* | | | Merge branch 'rs-warm-capybara-only-in-ci' into 'master'Rémy Coutable2017-07-111-0/+1
|\ \ \ \
| * | | | Don't attempt to warm the Capybara cache outside of CIrs-warm-capybara-only-in-ciRobert Speicher2017-07-101-0/+1
* | | | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-113-49/+155
|\ \ \ \ \
| * | | | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-tokenPawel Chojnacki2017-07-102-5/+7
| * | | | | Add tests for token auth.Pawel Chojnacki2017-07-062-16/+59
| * | | | | Add spaces between test phasesPawel Chojnacki2017-07-052-2/+19
| * | | | | Finish refactring processed configuraiton, and add test validating ip range m...Pawel Chojnacki2017-07-051-7/+21
| * | | | | Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-051-0/+16
| * | | | | Remove the need to use health check tokenPawel Chojnacki2017-07-053-36/+50
* | | | | | Merge branch 'sh-fix-award-emoji-spec' into 'master'Rémy Coutable2017-07-111-2/+2
|\ \ \ \ \ \
| * | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`sh-fix-award-emoji-specStan Hu2017-07-101-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Repair Regression caused by - !11573Paul Charlton2017-07-111-0/+51
* | | | | | Support multiple Redis instances based on queue typePaul Charlton2017-07-1174-231/+449
| |_|_|/ / |/| | | |
* | | | | Fix milestones destroy servicefix_milestone_destroy_serviceFelipe Artur2017-07-101-0/+51
|/ / / /
* | | | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-102-3/+81
|\ \ \ \
| * | | | Add spec for IssuableMetadata modulesh-optimize-mr-api-emojis-and-labelsStan Hu2017-07-081-0/+59
| * | | | Add spec for N+1 queriesStan Hu2017-07-081-0/+12
| * | | | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-081-3/+10
* | | | | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-102-2/+27
| |_|/ / |/| | |
* | | | Merge branch '34810-vue-pagination' into 'master'Phil Hughes2017-07-102-132/+171
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update tests to test what the component renders and what the clicks calls34810-vue-paginationFilipa Lacerda2017-07-072-157/+169