summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update database changes MR template49692-trim-MR-templateMark Lapierre2018-08-031-10/+20
* Merge branch 'rails5-update-rouge' into 'master'Rémy Coutable2018-08-032-1/+6
|\
| * Rails5: update Rails5 lock for forgotten gem rougeJasper Maes2018-08-032-1/+6
|/
* Merge branch 'patch-28' into 'master'Rémy Coutable2018-08-031-0/+1
|\
| * Update proofreader.mdEmily2018-08-021-0/+1
* | Merge branch '46940-hashed-storage-extend-enable-hashed-storage-for-all-new-p...Douglas Barbosa Alexandre2018-08-0317-105/+174
|\ \
| * | Resolve "Hashed storage: extend "Enable hashed storage for all new projects" ...Valery Sizov2018-08-0317-105/+174
|/ /
* | Merge branch '49776-pipeline-job-log-page-uses-too-much-cpu-for-loading-anima...Annabel Gray2018-08-035-20/+49
|\ \
| * | Resolve "Pipeline job log page uses too much CPU for loading animation"Dennis Tang2018-08-035-20/+49
|/ /
* | Merge branch 'frozen-string-enable-app-models-more' into 'master'Rémy Coutable2018-08-0379-0/+161
|\ \
| * | Enable frozen string for app/models/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models-moregfyoung2018-08-0379-0/+161
* | | Merge branch '45318-junit-FE' into 'master'Phil Hughes2018-08-0334-17/+1100
|\ \ \
| * | | Adds action spec to cover 204Filipa Lacerda2018-08-032-7/+21
| * | | Changes after review:Filipa Lacerda2018-08-0214-62/+67
| * | | Ports EE only CSS into CEFilipa Lacerda2018-08-021-0/+1
| * | | Adds frontend support to render test reports on theMR widgetFilipa Lacerda2018-08-0233-4/+1067
* | | | Merge branch 'fix/import-templates-spec' into 'master'Sean McGivern2018-08-032-1/+1
|\ \ \ \
| * | | | Fix spec warnings and template helperJames Lopez2018-08-032-1/+1
* | | | | Merge branch 'fix/gb/improve-blocked-user-tracking' into 'master'Sean McGivern2018-08-035-124/+64
|\ \ \ \ \
| * | | | | Still record redundant user session destruction eventsGrzegorz Bizon2018-08-031-2/+2
| * | | | | Simplify the check of reduntant user logout eventsGrzegorz Bizon2018-08-031-7/+7
| * | | | | Do not skip recording session destruction eventsGrzegorz Bizon2018-08-031-4/+4
| * | | | | Improve blocked user tracking code readabilityGrzegorz Bizon2018-08-034-4/+8
| * | | | | Remove an empty line from blocker user tracker classGrzegorz Bizon2018-08-021-1/+0
| * | | | | Skip redunant before_logout warden eventsGrzegorz Bizon2018-08-022-15/+15
| * | | | | Remove an empty line from the end of blocked_user_tracker.rbGrzegorz Bizon2018-08-021-1/+1
| * | | | | Improve authentication events-related code readabilityGrzegorz Bizon2018-08-014-8/+11
| * | | | | Do not implicitly authenticate user during session creationGrzegorz Bizon2018-08-012-2/+6
| * | | | | Simplify blocked user tracking during authenticationGrzegorz Bizon2018-08-014-119/+35
| * | | | | Improve blocked user tracking and fire some events only onceGrzegorz Bizon2018-08-014-9/+23
* | | | | | Merge branch '49899-merge-request-e-mail-link-has-full-url' into 'master'Sean McGivern2018-08-033-1/+10
|\ \ \ \ \ \
| * | | | | | Ensure links in notifications footer are not escapedRémy Coutable2018-08-033-1/+10
* | | | | | | Merge branch 'zj-update-repository-languages-rails5' into 'master'Yorick Peterse2018-08-031-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Update query simplificationZeger-Jan van de Weg2018-08-021-2/+1
* | | | | | | | Merge branch '49756-update-unicorn.rb.example.development' into 'master'Stan Hu2018-08-032-4/+21
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Copy important changes from unicorn.rb.example toLin Jen-Shin2018-07-312-4/+21
* | | | | | | | Merge branch 'ide-rename-files' into 'master'Filipa Lacerda2018-08-0326-93/+504
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed karmaPhil Hughes2018-08-021-1/+1
| * | | | | | | | added constants for modal typePhil Hughes2018-08-023-10/+20
| * | | | | | | | fixed review mode diffsPhil Hughes2018-08-024-44/+15
| * | | | | | | | only sends content if it existsPhil Hughes2018-08-021-1/+1
| * | | | | | | | removed un-used codePhil Hughes2018-08-022-7/+2
| * | | | | | | | more spec fixesPhil Hughes2018-08-021-1/+2
| * | | | | | | | spec fixesPhil Hughes2018-08-021-0/+3
| * | | | | | | | improve performance of deletingPhil Hughes2018-08-024-11/+19
| * | | | | | | | correctly show renaming and deleting entriesPhil Hughes2018-08-0110-15/+83
| * | | | | | | | updated dropdown button iconPhil Hughes2018-08-011-1/+1
| * | | | | | | | fixed karmaPhil Hughes2018-07-311-3/+14
| * | | | | | | | specsPhil Hughes2018-07-317-15/+208
| * | | | | | | | karma fixesPhil Hughes2018-07-306-4/+15