summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '19420-render-only-commit-title' into 'master' 19889-shortcuts-modal-is-brokenDouwe Maan2016-07-184-4/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render only commit title ## What does this MR do? Render only commit title in builds ## Why was this MR needed? Better readability ## What are the relevant issue numbers? Closes #19420 ## Screenshots (if relevant) ![after](/uploads/fcdd59d74a0f91f6ac847f7f02d5f07f/after.png)![before](/uploads/71ca6dabf31452a1a8dfb15ecb8860c5/before.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @kradydal @yorickpeterse @grzesiek @tmaczukin @dzaporozhets [@tomash](https://github.com/tomash) [@chastell](https://github.com/chastell) this is connected to closed MR [!5109](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5109) See merge request !5131
| * add modification to commit title testubudzisz2016-07-181-9/+13
| | | | | | | | | | | | add modification to commit title test add empty line
| * modify view test to commit titleubudzisz2016-07-182-2/+0
| | | | | | | | | | | | | | | | | | | | modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop remove empty line in CHANGELOG
| * Update CHANGELOGula budziszewska2016-07-181-2/+1
| |
| * add test to viewubudzisz2016-07-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | repair rubocop test and update CHANGELOG repair rubocop test repair rubocop repair rubocop repair rubocop
| * render only commit titleubudzisz2016-07-181-0/+1
| | | | | | | | update CHANGELOG
| * Update CHANGELOG - remove empty lineula budziszewska2016-07-181-1/+0
| |
| * modify view test to commit titleubudzisz2016-07-181-10/+5
| | | | | | | | | | | | | | | | modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop
| * Update CHANGELOGula budziszewska2016-07-181-2/+2
| |
| * add test to viewubudzisz2016-07-182-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | repair rubocop test and update CHANGELOG repair rubocop test repair rubocop repair rubocop repair rubocop
| * repair rubocop testubudzisz2016-07-181-1/+1
| |
| * add git-commit-title-method into pipeline model and modify viewubudzisz2016-07-183-1/+14
| | | | | | | | add git-commit-title-method into tests
| * add try to title methodubudzisz2016-07-181-1/+1
| |
| * render-only-commit-title-updateubudzisz2016-07-181-1/+1
| |
| * render only commit titleubudzisz2016-07-181-2/+0
| | | | | | | | update CHANGELOG
| * add try to title methodubudzisz2016-07-181-1/+1
| |
| * render-only-commit-title-updateubudzisz2016-07-181-2/+2
| |
| * render only commit titleubudzisz2016-07-182-3/+6
| | | | | | | | update CHANGELOG
* | Merge branch 'dz-improve-markdown' into 'master' Dmitriy Zaporozhets2016-07-182-16/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve markdown Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4975 (thanks @sheerun) with small changes on top cc @iamphill @tauriedavis See merge request !5314
| * | Reduce font-size for headers for nicer and more compact lookdz-improve-markdownDmitriy Zaporozhets2016-07-181-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'patch1' of https://gitlab.com/sheerun/gitlab-ce into ↵Dmitriy Zaporozhets2016-07-182-16/+18
| |\ \ | | | | | | | | | | | | dz-improve-markdown
| | * | Improve readability of markdown filesAdam Stankiewicz2016-07-112-16/+18
| | | |
* | | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-1835-304/+507
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
| * | | | Remove `lock_version` from the `merge_requests` table.undo-revert-of-4892Timothy Andrew2016-07-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This was introduced (at some point) while rebasing `master` against the "developers can merge" feature branch. - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5310#note_13139705
| * | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-1835-304/+508
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'master' into 'master' Jacob Schatz2016-07-182-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix activity heatmap to show proper day name. ## What does this MR do? This MR fixes issue #19909. ## Are there points in the code the reviewer needs to double check? Not necessarily, it's pretty straightforward, buuuut There was some discussion about whether GL wanted the activity heatmap to start on Monday or Sunday, this fix makes it start on Sunday, if GL is wanting it to start on Monday then some more substantial changes need to be made on the `calendar.js.coffee` script. ## Why was this MR needed? The amount of day names that were off from their dates was too damn high! :P ## What are the relevant issue numbers? Directly #19909 Also some related discussion (feature discussion): #19282, #5988 ## Screenshots (if relevant) **Currently on GL.com** ![Screen_Shot_2016-07-16_at_10.56.02_PM](/uploads/b45cfc56c29a8865a2bdc1f798409706/Screen_Shot_2016-07-16_at_10.56.02_PM.png) **After MR** ![Screen_Shot_2016-07-16_at_10.56.30_PM](/uploads/d8655bb259ced443a2c572ff03dcb8bb/Screen_Shot_2016-07-16_at_10.56.30_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5303
| * | | | Update CHANGELOG fix indenting.eanplatter2016-07-181-1/+1
| | | | |
| * | | | Fix activity heatmap to show proper day name.eanplatter2016-07-162-1/+2
| | | | |
* | | | | Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into ↵Rémy Coutable2016-07-182-1/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't blow up in tree view on empty repo ## What does this MR do? Stop the empty repo page blowing up with a 500 error when a user's default view is tree view. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4997 made sure that the `tree` filter was only called if the user's default project view is tree, but left out the empty repo check. When users visit an empty repo with the tree view as default, they now get a 500. ## What are the relevant issue numbers? Closes #19928. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ (bug introduced in same release) - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5317
| * | | | | Don't blow up in tree view on empty repoSean McGivern2016-07-182-1/+21
| | |_|_|/ | |/| | |
* | | | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into ↵Yorick Peterse2016-07-183-0/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't parse Rinku returned value to DocFragment when didn't change original html string. See merge request !5311
| * | | | | Don't parse Rinku returned value to DocFragment when it didn't change the ↵18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-183-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | original html string.
* | | | | | Merge branch 'fix-track-user-migration' into 'master' Rémy Coutable2016-07-181-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable transaction when adding index for Ci::Pipeline ## What does this MR do? Adds missing `disable_ddl_transaction!` ## Why was this MR needed? Fixes a broken migration for PostgreSQL See merge request !5319
| * | | | | | Disable transaction when adding index for Ci::PipelineKamil Trzcinski2016-07-181-0/+2
|/ / / / / /
* | | | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-189-125/+151
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store when and yaml variables in builds table ## What does this MR do? Stores `when` and `yaml_variables` in `ci_builds` table. ## Why was this MR needed? This is done in order to simplify the code responsible for creating a pipeline builds. ## What are the relevant issue numbers? This made as a pre-step for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5296
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-18111-1673/+1979
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store-variables-and-when-in-builds-table # Conflicts: # db/schema.rb
| * | | | | | Refactor gitlab_ci_yaml_processor variables testsKamil Trzcinski2016-07-171-52/+76
| | | | | | |
| * | | | | | Remove irrelevant commentsKamil Trzcinski2016-07-161-14/+0
| | | | | | |
| * | | | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-5/+5
| | | | | | |
| * | | | | | Fix AddWhenAndYamlVariablesToCiBuilds migrationKamil Trzcinski2016-07-161-1/+1
| | | | | | |
| * | | | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-1/+1
| | | | | | |
| * | | | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-169-73/+89
| | | | | | |
* | | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-185-35/+138
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make docker registry work with location redirects when external storage is used ## What does this MR do? Honor `Location:` header when working with local registry. Location makes it possible to download manifests from external storage. ## What are the relevant issue numbers? Fixed https://gitlab.com/gitlab-org/gitlab-ce/issues/18477 ## Remark Adding `FollowRedirects` makes that we leak `Authorization:` in followed requests. That is why it is implemented manually and we are explicitly removing `Authorization` header. cc @marin @twk3 See merge request !4677
| * | | | | | | Update CHANGELOGdocker-registry-work-with-redirectKamil Trzciński2016-07-151-1/+0
| | | | | | | |
| * | | | | | | Make rubocop happyKamil Trzcinski2016-07-151-1/+1
| | | | | | | |
| * | | | | | | Add CHANGELOGKamil Trzcinski2016-07-151-0/+1
| | | | | | | |
| * | | | | | | Explicitly remove authorization token and make sure that invalid addresses ↵Kamil Trzcinski2016-07-153-51/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are properly handled
| * | | | | | | Allow blob to be redirectedKamil Trzcinski2016-07-151-3/+34
| | | | | | | |
| * | | | | | | Make docker registry work with location redirects when external storage is usedKamil Trzcinski2016-07-152-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-187-21/+90
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pending Tab to Builds ## What does this MR do? Add Pending Tab to Builds and separate "running" and "pending" jobs in UI. ## Why was this MR needed? Increase visibility to "pending" . ## What are the relevant issue numbers? Closes #19408 ## Screenshots Before: ![Zrzut_ekranu_2016-07-05_o_11.52.48](/uploads/01dc1f3664f5aacb2ec09d52d19c521e/Zrzut_ekranu_2016-07-05_o_11.52.48.png) After: ![Zrzut_ekranu_2016-07-05_o_11.51.34](/uploads/f3be02427996fecf50c65dd51ce1b9fb/Zrzut_ekranu_2016-07-05_o_11.51.34.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin @zj [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5084
View Lorry Controller Status