summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to make spec/features/projects/blobs/blob_show_spec.rb more robust48837-red-master-file-blob-markdown-file-visiting-directly-displays-the-blob-using-the-rich-viewerRémy Coutable2018-07-051-65/+23
* Merge branch 'issue_48474' into 'master'Sean McGivern2018-07-055-1/+40
|\
| * Merge branch 'issue_48474' of gitlab.com:gitlab-org/gitlab-ce into issue_48474Felipe Artur2018-07-041-1/+1
| |\
| | * Remove space between curly braceFelipe Artur2018-06-281-1/+1
| * | Render LegacyDiffNote when diff_file blob is nilFelipe Artur2018-07-043-0/+20
| |/
| * Fix discussion entity for legacy diff notesFelipe Artur2018-06-272-1/+20
* | Merge branch 'i18n-extract-app/views/projects-snippets' into 'master'Rémy Coutable2018-07-056-26/+44
|\ \
| * | i18n: externalize strings from 'app/views/projects/snippets'Tao Wang2018-07-016-26/+44
* | | Merge branch 'frozen-string-enable-app-uploaders' into 'master'Rémy Coutable2018-07-0516-1/+36
|\ \ \
| * | | Enable frozen string in apps/validators/*.rbgfyoung2018-07-0516-1/+36
* | | | Merge branch 'docs/use-ref-slug-for-docs-review' into 'master'Rémy Coutable2018-07-052-12/+8
|\ \ \ \
| * | | | Simplify downstream branch nameAchilleas Pipinellis2018-07-052-10/+6
| * | | | Use CI_COMMIT_REF_SLUG for the env URL in review-docs jobsAchilleas Pipinellis2018-07-041-2/+2
* | | | | Merge branch 'rm-wrong-changelog' into 'master'Rémy Coutable2018-07-051-5/+0
|\ \ \ \ \
| * | | | | Remove unneeded changelogAchilleas Pipinellis2018-07-051-5/+0
* | | | | | Merge branch 'remove-unnecessary-ignore-for-gitaly-n-plus-one' into 'master'Douwe Maan2018-07-052-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove Gitaly N+1 ignore from NotificationRecipientService specSean McGivern2018-07-041-4/+4
| * | | | | Clean up Gitaly N+1 stack tracesSean McGivern2018-07-041-1/+1
* | | | | | Merge branch '48779-qa-merge-request-squash-sometimes-fail' into 'master'Sean McGivern2018-07-052-9/+37
|\ \ \ \ \ \
| * | | | | | [QA] Ensure we wait for the squash checbox to be clickable before clicking it...Rémy Coutable2018-07-052-9/+37
* | | | | | | Update CHANGELOG.md for 11.0.3GitLab Release Tools Bot2018-07-0515-71/+20
* | | | | | | Merge branch 'close-revoke-deploy-token-modal-on-escape-keypress' into 'master'Phil Hughes2018-07-053-1/+31
|\ \ \ \ \ \ \
| * | | | | | | Close revoke deploy token modal on escape keypressGeorge Tsiolis2018-07-053-1/+31
|/ / / / / / /
* | | | | | | Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into 'mas...Phil Hughes2018-07-058-16/+178
|\ \ \ \ \ \ \
| * | | | | | | populate environments dropdown, add testsJose2018-07-048-20/+136
| * | | | | | | Add environments endpoint, also added store and service capabilities for said...Jose2018-07-034-7/+30
| * | | | | | | Moves the request of the environments list to the index actionTiago Botelho2018-07-032-17/+6
| * | | | | | | Adds environments list to additional_metrics JSON payloadTiago Botelho2018-07-031-1/+6
| * | | | | | | Serializes environments list in metrics JSON endpointTiago Botelho2018-07-031-2/+7
| * | | | | | | Add dropdown, without dataJose2018-07-033-9/+30
| * | | | | | | Add environments list instance variable to environment metrics viewTiago Botelho2018-07-032-3/+6
* | | | | | | | Merge branch 'ce-5787-extract-ee-boards' into 'master'Phil Hughes2018-07-056-37/+93
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Port of EE refactoring to extract EE lines from boardsPaul Slaughter2018-07-036-37/+93
* | | | | | | | Merge branch 'update_shibboleth' into 'master'Rémy Coutable2018-07-054-12/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Update OmniAuth Shibboleth gem to latest to gain supportTom Downes2018-07-044-12/+25
* | | | | | | | | Merge branch '48853-failing-eslint-on-master' into 'master'Rémy Coutable2018-07-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ESLint for app/assets/javascripts/pages/projects/index.jsWinnie Hellmann2018-07-041-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'winh-rubocop-capybara-featuremethods' into 'master'Rémy Coutable2018-07-05216-847/+849
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Enable Capybara/FeatureMethods copWinnie Hellmann2018-07-05216-847/+849
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-failing-rspec-gcp-new-page-layout' into 'master'Rémy Coutable2018-07-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix failing spec test in gcp_specDennis Tang2018-07-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-cloud-native-trigger' into 'master'Rémy Coutable2018-07-051-4/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update the cloud-native trigger call in the UIDJ Mountney2018-07-051-4/+2
|/ / / / / / /
* | | | | | | Merge branch '45739-add-metrics-to-operations-tab' into 'master'Filipa Lacerda2018-07-0410-4/+99
|\ \ \ \ \ \ \
| * | | | | | | Added shortcuts help, i18n45739-add-metrics-to-operations-tabJose2018-07-043-4/+10
| * | | | | | | Makes production environment the default environment for a projectTiago Botelho2018-07-043-1/+32
| * | | | | | | Fixes backend specsTiago Botelho2018-07-021-2/+2
| * | | | | | | Changes Operations navigation pathTiago Botelho2018-06-291-1/+1
| * | | | | | | Remove GET empty from EnvironmentsControllerTiago Botelho2018-06-294-25/+8
| * | | | | | | Prevents project first environment from being fetched in every project viewTiago Botelho2018-06-2810-35/+35
View Lorry Controller Status