summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-144-46/+29
|\
| * Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_namesPawel Chojnacki2017-07-131-19/+13
| * Add unit to latency metrics.Ben Kochie2017-07-123-20/+20
| * Update rack metric namesBen Kochie2017-07-121-12/+1
* | Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-sear...Sean McGivern2017-07-142-3/+18
|\ \
| * | Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-142-3/+18
* | | Merge branch 'pass-before-script-as-is' into 'master'Grzegorz Bizon2017-07-142-24/+72
|\ \ \
| * | | Pass before_script and script as-is preserving arrayspass-before-script-as-isKamil Trzcinski2017-07-072-24/+72
* | | | Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-143-2/+39
* | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' int...Sean McGivern2017-07-143-21/+72
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove one assertion from projects controller specsGrzegorz Bizon2017-07-141-3/+2
| * | | Adds specs for renaming a project with container imagesGrzegorz Bizon2017-07-141-0/+15
| * | | Fix rubocop offense in projects controller specsGrzegorz Bizon2017-07-141-1/+1
| * | | Add specs for changing default branch in a projectGrzegorz Bizon2017-07-141-9/+25
| * | | Recover from renaming project that has container imagesGrzegorz Bizon2017-07-133-14/+35
* | | | Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes'...Grzegorz Bizon2017-07-141-7/+0
|\ \ \ \
| * | | | Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codesShinya Maeda2017-07-131-7/+0
* | | | | Merge branch '19629-remove-inactive-tokens-list' into 'master'Filipa Lacerda2017-07-142-10/+14
|\ \ \ \ \
| * | | | | Update test description to reflect behaviour19629-remove-inactive-tokens-listkushalpandya2017-07-141-1/+1
| * | | | | Update tests to cover removal of inactive tokens tablekushalpandya2017-07-142-9/+13
* | | | | | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-141-21/+0
* | | | | | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-141-8/+8
|\ \ \ \ \ \
| * | | | | | Change Git::Repository#log to return CommitsJacob Vosmaer2017-07-131-8/+8
| | |_|/ / / | |/| | | |
* | | | | | 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
| |/ / / /