- 31 Aug, 2016 1 commit
-
-
Stan Hu authored
Remove not-null constraint on lock_version column if it exists Closes #21678 See merge request !6118
-
- 30 Aug, 2016 39 commits
-
-
Fatih Acet authored
Check for pipelines when setting page_gutter_class. ## What does this MR do? Fixes regression issue related to the MR window sliding behind the right sidebar on page refresh. ## Are there points in the code the reviewer needs to double check? I'm getting stuck thinking about if/how to test this. Or maybe it just deserves a note somewhere about remembering to update `page_gutter_class` when a new route is added? ## Why was this MR needed? This regression prevented users from using many features of the MR view. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21121 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-23_at_11.08.04_AM](/uploads/bad1a83569022a7fc699a978c5abef62/Screen_Shot_2016-08-23_at_11.08.04_AM.png) After: ![Screen_Shot_2016-08-23_at_11.07.46_AM](/uploads/6cbcb2f849c68dfc93d8a4b53089b06e/Screen_Shot_2016-08-23_at_11.07.46_AM.png) ## 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 - [ ] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @jschatz1 See merge request !5952
-
Fatih Acet authored
Added search for all lists on issue boards ## What does this MR do? Adds a search box to allow the user to search all lists in issue boards rather than just the backlog. ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_10.33.15](/uploads/67e96055d60a9b3209ce3831a1980c09/Screen_Shot_2016-08-30_at_10.33.15.png) ![Screen_Shot_2016-08-30_at_10.33.19](/uploads/8d5253b8f2ecf1cf9a69d70be8ccf1f9/Screen_Shot_2016-08-30_at_10.33.19.png) ## What are the relevant issue numbers? Closes #21139 See merge request !6101
-
Stan Hu authored
Closes #21678
-
Robert Speicher authored
Added project specific enable/disable setting for LFS ## What does this MR do? Adds project specific enable/disable setting for LFS ## What are the relevant issue numbers? Needed for #18092 See merge request !5997
-
Fatih Acet authored
Resize created icon ## What does this MR do? Resizes `created` SVG ## Why was this MR needed? Because: ![Screen_Shot_2016-08-30_at_3.33.38_PM](/uploads/c4c987e323b4c9cedeb298f08abbc307/Screen_Shot_2016-08-30_at_3.33.38_PM.png) Hard-coding in the size into the SVG isn't a great solution, but we've got a bit of technical debt here. All the other icons are sized this way, so for this patch fix I think we should just match it. Ideally we'll have classes directly in the SVG code so we can target all these icons properly, and do all color/sizing through CSS ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_3.35.49_PM](/uploads/35cf6372142b45b708b6757ea965c075/Screen_Shot_2016-08-30_at_3.35.49_PM.png) See merge request !6114
-
Robert Speicher authored
prevent authored awardable thumbs votes ## What does this MR do? This MR should prevent users from upvoting or downvoting issues/merge requests/notes authored by them. ## What are the relevant issue numbers? Closes #20913 See merge request !5841
-
Patricio Cano authored
-
Stan Hu authored
Fix CHANGELOG Remove duplicate 8.11.4 entries and mark 8.11.3 as released. [ci skip] See merge request !6116
-
Stan Hu authored
Remove duplicate 8.11.4 entries and mark 8.11.3 as released. [ci skip]
-
Stan Hu authored
Remove default value for lock_version ## What does this MR do? From the very beginning we added `lock_version` column with default value, then we reverted that MR. A bit later we added that migration again but column's default value has been removed from migration. So if you installed GitLab form master it's possible that you have default value, which caused the bug. We don't need to change a CHANGELOG here I think. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21527 and https://dev.gitlab.org/gitlab/organization/issues/971 See merge request !6111
-
Patricio Cano authored
-
Patricio Cano authored
-
Patricio Cano authored
-
Valery Sizov authored
-
Annabel Dunstone authored
-
barthc authored
-
Robert Speicher authored
Drop unused CI tables and files See merge request !6014
-
barthc authored
-
Achilleas Pipinellis authored
docs: make sure to update 8.10-to-8.11 workhorse version too (see !5983) ## What does this MR do? Make sure to remember the correct workhorse version for specific version update instructions for those of us still doing source installs. Related to !5983. See merge request !6049
-
Achilleas Pipinellis authored
Update projects.md ## What does this MR do? Repaired some examples for a branches in projects.md See merge request !6018
-
Fatih Acet authored
Add last commit time to repo view ## What does this MR do? Adds the last commit time to the repository file view ## Are there points in the code the reviewer needs to double check? Just need to make sure it works well in responsive (It is working well to my knowledge
😃 ) ## Why was this MR needed? Allow users to see more information related to the last commit ## What are the relevant issue numbers? Closes #20224 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-27_at_1.54.03_PM](/uploads/2b3da5c6b82965fd302abe590d2b0e46/Screen_Shot_2016-07-27_at_1.54.03_PM.png) After: ![Screen_Shot_2016-07-27_at_1.54.09_PM](/uploads/1f5f5fe1bd6f193090067a41ac4e3c66/Screen_Shot_2016-07-27_at_1.54.09_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] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5530 -
Douwe Maan authored
user is now notified when creating an issue through the api Previously when a issue was created through our API it would not mail label subscribers, this MR aims to fix that - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19721 See merge request !5720
-
Douwe Maan authored
Add a download buttons for Build Artifacts ## What does this MR do? This MR adds a download buttons for build artifacts of latest succesful pipeline in: - dashboard of project, - branches and tags views, - and tree viewer Implement #4255 ## What are the relevant issue numbers? Closes #4255, Closes #14419 ## Screenshots ### Project main ![](/uploads/29ee2154a214416059a875f2715d4fa3/Screen_Shot_2016-08-24_at_8.00.31_PM.png) ### Branches ![](/uploads/9220c593288370986fbc1d42a1425ef7/Screen_Shot_2016-08-24_at_8.02.01_PM.png) ### Tags ![](/uploads/a843e8103221fea475a0cf9d62a1999d/Screen_Shot_2016-08-24_at_8.03.32_PM.png) ### Source Tree ![](/uploads/63cd3c8c91b6f427c166dc90d8e3c059/Screen_Shot_2016-08-24_at_8.04.56_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Download buttons - [x] Models - [x] Routes - [x] Projects::ArtifactsController - [x] API - Tests - Rails - [x] Project#builds_for - [x] branch name with slashes - [x] only success builds - [x] only latest builds - [x] feature tests for download buttons - API - [x] branch name with slashes - [x] only success builds - [x] only latest builds - [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 !5142
-
Fatih Acet authored
Add new icon for created pipeline ## What does this MR do? Adds new icon for `created` status ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_11.55.02_AM](/uploads/e062f9eb3b8102374fb92ce209ab69b1/Screen_Shot_2016-08-30_at_11.55.02_AM.png) ## What are the relevant issue numbers? Closes #21520 See merge request !6108
-
Douwe Maan authored
Shorten task status phrase ## What does this MR do? Shortens the task status phrase to make it easier to read ## Are there points in the code the reviewer needs to double check? Shouldn't be any ## Why was this MR needed? Improve readability/scan-ability of the issues table ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-27_at_12.38.17_PM](/uploads/12d54e4ce24dea203e8f7189b32e3a43/Screen_Shot_2016-08-27_at_12.38.17_PM.png) After: ![Screen_Shot_2016-08-27_at_12.38.05_PM](/uploads/7dfcc3284025b889f6afa09ca273d928/Screen_Shot_2016-08-27_at_12.38.05_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) ## What are the relevant issue numbers? Closes #21543 See merge request !6062
-
Douwe Maan authored
Clarify blank line rule in newlines_styleguide.md ## What does this MR do? * Corrects a typo in the GitLab Ruby newlines style guide * Makes some vague language in the original guideline more precise ## Are there points in the code the reviewer needs to double check? n/a ## Why was this MR needed? * There was a typo in the original text. * The original text was vague. ## What are the relevant issue numbers? n/a ## Screenshots (if relevant) n/a ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (Is this recommended for this kind of patch?) - ~~[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~~ - [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 !6048
-
Douwe Maan authored
User can edit closed MR with deleted fork ## What does this MR do? User can edit closed MR with deleted fork (can't change "Target branch"). When fork is deleted "Reopen" button is hidden. ## What are the relevant issue numbers? Closes #19315 ## Screenshots (if relevant) * hidden Reopen button and information about deleted fork ![Zrzut_ekranu_2016-08-12_o_13.19.24](/uploads/d288c5625e788382e31b2979acb601df/Zrzut_ekranu_2016-08-12_o_13.19.24.png) * editable fields for closed MR without fork ![Zrzut_ekranu_2016-08-05_o_12.24.38](/uploads/1549e54d4bc2a9939ef296ce66139706/Zrzut_ekranu_2016-08-05_o_12.24.38.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [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 @ubudzisz @yorickpeterse @grzesiek @tmaczukin See merge request !5496
-
Fatih Acet authored
Fix inconsistent background color for filter input field ## What does this MR do? Removes the background color for the filter input field for the [projects dashboard](https://gitlab.com/dashboard/projects) and [groups page](https://gitlab.com/groups/gitlab-org) to stay consistent with the other input fields ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Fixes UI inconsistency ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-29_at_11.07.28_AM](/uploads/dbd02534686a109fc98b838d2f332a42/Screen_Shot_2016-08-29_at_11.07.28_AM.png) After: ![Screen_Shot_2016-08-29_at_11.07.38_AM](/uploads/4003a622c8568ce9c973a17c8f74557e/Screen_Shot_2016-08-29_at_11.07.38_AM.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) ## What are the relevant issue numbers? Closes #21399 See merge request !6089
-
tiagonbotelho authored
-
tiagonbotelho authored
-
tiagonbotelho authored
adds test to check whether or not an email is sent to label subscribers after creating a new issue through the api
-
tiagonbotelho authored
-
Achilleas Pipinellis authored
Update Bitbucket OmniAuth documentation ## What does this MR do? Updates the Bitbucket integration documentation. ## Why was this MR needed? Current documentation is out of date and very confusing. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2137 and https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1052. See merge request !6106
-
Annabel Dunstone authored
-
Douwe Maan authored
Fix diff comments on legacy MRs ## What does this MR do? Allow diff commenting on MRs without complete diff refs. (Commenting would work before, but the JSON response would fail, so you'd only see your comment after a refresh.) ## Are there points in the code the reviewer needs to double check? Is this really all I needed to do? I feel like there must be more to it
😊 ## Why was this MR needed? It's a regression! ## What are the relevant issue numbers? Closes #21211. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6029 -
Douwe Maan authored
Fix resolving conflicts on forks ## What does this MR do? When we resolve conflicts, we create a merge commit in the source branch with parents `[source_branch_head, target_branch_head]`. But when the MR is from a fork, `target_branch_head` might not exist in the source repo at all, so we need to fetch it if it isn't there. We can do this locally so it should be fast. ## Are there points in the code the reviewer needs to double check? The `TestEnv` changes are needed to reset the branch refs if we're reusing a git directory locally - otherwise, there might not be conflicts! ## Why was this MR needed? It's a bug in a new feature! ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21459. See merge request !6082
-
Achilleas Pipinellis authored
-
Sean McGivern authored
-
Sean McGivern authored
-