summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'import-project-modal-fix' into 'master'docs-group-milestonesFilipa Lacerda2017-08-111-1/+1
|\
| * Fixes the correct import modal window not showingimport-project-modal-fixPhil Hughes2017-08-111-1/+1
* | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-1115-39/+210
|\ \
| * | Add option to disable project export on instanceRobin Bobbitt2017-08-1113-38/+194
| * | Add option to disable project export on instance - db changesRobin Bobbitt2017-08-112-1/+16
* | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-08-111-11/+7
|\ \ \
| * | | Fix formatting of patch_versions.mdJan Bruckner2017-08-111-11/+7
* | | | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-116-26/+25
|\ \ \ \
| * | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-116-26/+25
* | | | | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-118-48/+26
|\ \ \ \ \
| * | | | | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-118-48/+26
| | |/ / / | |/| | |
* | | | | Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-116-8/+80
|\ \ \ \ \
| * | | | | Better caching and indexing of broadcast messagesYorick Peterse2017-08-116-8/+80
| | |_|/ / | |/| | |
* | | | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ...Sean McGivern2017-08-113-9/+20
|\ \ \ \ \
| * | | | | Include the `is_admin` field in the `GET /users/:id` API when current user is...Rémy Coutable2017-08-113-9/+20
* | | | | | Merge branch 'winh-git-revision-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-112-4/+6
|\ \ \ \ \ \
| * | | | | | Make Git revision dropdown style consistentwinh-git-revision-dropdown-stylewinh2017-08-092-4/+6
* | | | | | | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' into...Douwe Maan2017-08-114-1/+23
|\ \ \ \ \ \ \
| * | | | | | | Pending delete projects no longer return 500 error in Admins projects view35435-pending-delete-project-error-in-admin-interface-fixTiago Botelho2017-08-114-1/+23
* | | | | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-1113-106/+706
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Document rspec-retry and rspec-flakyRémy Coutable2017-08-111-3/+20
| * | | | | | | Fix cop descriptionRémy Coutable2017-08-111-3/+2
| * | | | | | | Retrieve and sync flaky specs report from and to S3Rémy Coutable2017-08-113-88/+147
| * | | | | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-118-12/+537
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'dm-session-delete-challenge' into 'master'Robert Speicher2017-08-111-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Delete correct key from `session` after authenticating using U2Fdm-session-delete-challengeDouwe Maan2017-08-111-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1151-173/+2042
|\ \ \ \ \ \
| * | | | | | Use a specialized class for querying eventsYorick Peterse2017-08-1012-17/+241
| * | | | | | Migrate events into a new formatYorick Peterse2017-08-1041-157/+1802
* | | | | | | Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-117-6/+98
|\ \ \ \ \ \ \
| * | | | | | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-107-6/+98
* | | | | | | | Merge branch '36174-show-error-message-for-500-in-tests' into 'master'Rémy Coutable2017-08-112-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Show error message for API 500 error in tests, andLin Jen-Shin2017-08-112-1/+18
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into '...Rémy Coutable2017-08-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not run the `ee_compat_check` job for stableish branches35131-do-not-run-ee_compat_check-for-stableish-branchesRémy Coutable2017-08-111-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '36328-deserializemergerequestdiffsandcommits-fails-due-to-null-...Yorick Peterse2017-08-112-0/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix merge request diff deserialisation when too_large was absentSean McGivern2017-08-112-0/+13
| |/ / / / / /
* | | | | | | Merge branch 'rs-rspec-hook-argument-cop' into 'master'Rémy Coutable2017-08-1159-92/+85
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove documentation about rules that are now enforced by RuboCoprs-rspec-hook-argument-copRobert Speicher2017-08-101-6/+0
| * | | | | | Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-1058-86/+85
* | | | | | | Merge branch 'fix-36308' into 'master'Rémy Coutable2017-08-111-5/+4
|\ \ \ \ \ \ \
| * | | | | | | Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rbMehdi Lahmam2017-08-111-5/+4
* | | | | | | | Merge branch 'bump-omniauth-ldap-gem-version-2-0-4' into 'master'Douwe Maan2017-08-113-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-113-3/+7
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'zj-ref-path-monospace' into 'master'Douwe Maan2017-08-112-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix 404 on link pathzj-ref-path-monospaceZ.J. van de Weg2017-08-102-1/+5
* | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-08-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.Olivier DOSSMANN2017-08-111-1/+1
* | | | | | | | | Merge branch 'gitlab-git-expose-raw-log' into 'master'Sean McGivern2017-08-111-16/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Expose the raw_log methodgitlab-git-expose-raw-logJacob Vosmaer2017-08-091-16/+17
View Lorry Controller Status