summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '35952-keep-admin-settings-open-after-submit' into 'master'Filipa Lacerda2018-08-0630-30/+30
|\
| * ensure all admin settings panels remain open after form submissionMike Greiling2018-08-0630-30/+30
* | fix `/failures` JS init in pipelines viewLukas Eipert2018-08-062-10/+4
* | Merge branch '25990-improve-web-terminal' into 'master'Phil Hughes2018-08-063-60/+55
|\ \ | |/ |/|
| * Focus terminal on loadFilipa Lacerda2018-08-032-14/+6
| * Uses npm css and removes css from vendor folderFilipa Lacerda2018-08-033-2/+3
| * Move xterm to a node dependency and remove global code [ci skip]Filipa Lacerda2018-08-033-58/+60
* | Merge branch '6860-FE-instance-level-project-templates' into 'master'Tim Zallmann2018-08-058-52/+62
|\ \
| * | backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Lukas Eipert2018-08-038-52/+62
* | | revert changes from gitlab-org/gitlab-ce!21018Mike Greiling2018-08-031-14/+2
* | | Port of protected environments frontend changes from EE to CEMike Greiling2018-08-033-19/+41
* | | Add group milestones to dashboard milestone pageChantal Rollison2018-08-036-4/+59
* | | Merge branch '47548-monospace-commit-messages' into 'master'Mike Greiling2018-08-034-17/+23
|\ \ \
| * | | Update commit description border and paddingPaul Slaughter2018-08-031-2/+2
| * | | Update commit description styles to monospace font and overflow-xPaul Slaughter2018-08-034-17/+19
| * | | Port EE lines into CE for commits.scssPaul Slaughter2018-08-031-0/+4
* | | | Merge branch 'artifact-format-v2-with-parser' into 'master'Kamil Trzciński2018-08-0311-0/+170
|\ \ \ \ | |/ / / |/| | |
| * | | Add factory for parsers. Add required specification in json schema matcher. I...Shinya Maeda2018-08-031-6/+1
| * | | Remove frontend changesShinya Maeda2018-08-031-9/+0
| * | | Fix static analysysShinya Maeda2018-08-031-2/+2
| * | | Use serializable_hash for compared resultsShinya Maeda2018-08-032-2/+2
| * | | Added unique identifier to calculate_reactive_cache. Decoupled comparison log...Shinya Maeda2018-08-033-21/+36
| * | | Merge branch 'master-ce' into artifact-format-v2-with-parserShinya Maeda2018-08-03153-65/+374
| |\ \ \
| * | | | Simplify the query to fetch base and head pipelinesShinya Maeda2018-08-021-5/+2
| * | | | Set polling interval to the header in test_reports endpointShinya Maeda2018-08-021-0/+2
| * | | | Squashed commit of the following:Shinya Maeda2018-08-0211-0/+170
* | | | | Resolve "Hashed storage: extend "Enable hashed storage for all new projects" ...Valery Sizov2018-08-037-84/+108
* | | | | Resolve "Pipeline job log page uses too much CPU for loading animation"Dennis Tang2018-08-034-20/+44
* | | | | Merge branch 'frozen-string-enable-app-models-more' into 'master'Rémy Coutable2018-08-0378-0/+156
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Enable frozen string for app/models/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models-moregfyoung2018-08-0378-0/+156
* | | | | Merge branch '45318-junit-FE' into 'master'Phil Hughes2018-08-0321-7/+522
|\ \ \ \ \
| * | | | | Adds action spec to cover 204Filipa Lacerda2018-08-031-2/+4
| * | | | | Changes after review:Filipa Lacerda2018-08-0211-50/+44
| * | | | | Ports EE only CSS into CEFilipa Lacerda2018-08-021-0/+1
| * | | | | Adds frontend support to render test reports on theMR widgetFilipa Lacerda2018-08-0220-4/+522
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/gb/improve-blocked-user-tracking' into 'master'Sean McGivern2018-08-031-4/+9
|\ \ \ \ \
| * | | | | Improve blocked user tracking code readabilityGrzegorz Bizon2018-08-031-1/+0
| * | | | | Skip redunant before_logout warden eventsGrzegorz Bizon2018-08-021-10/+1
| * | | | | Improve authentication events-related code readabilityGrzegorz Bizon2018-08-011-4/+7
| * | | | | Do not implicitly authenticate user during session creationGrzegorz Bizon2018-08-011-1/+5
| * | | | | Improve blocked user tracking and fire some events only onceGrzegorz Bizon2018-08-011-4/+12
* | | | | | Merge branch '49899-merge-request-e-mail-link-has-full-url' into 'master'Sean McGivern2018-08-031-1/+1
|\ \ \ \ \ \
| * | | | | | Ensure links in notifications footer are not escapedRémy Coutable2018-08-031-1/+1
| | |_|/ / / | |/| | | |
* | | | | | 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 'ide-rename-files' into 'master'Filipa Lacerda2018-08-0317-55/+243
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | added constants for modal typePhil Hughes2018-08-023-10/+20
| * | | | | | fixed review mode diffsPhil Hughes2018-08-022-3/+10
| * | | | | | only sends content if it existsPhil Hughes2018-08-021-1/+1
| * | | | | | removed un-used codePhil Hughes2018-08-022-7/+2