- 11 Oct, 2016 1 commit
-
-
Achilleas Pipinellis authored
[ci skip]
-
- 07 Oct, 2016 8 commits
-
-
Achilleas Pipinellis authored
Container Registry refactor docs From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6516 See merge request !790
-
Achilleas Pipinellis authored
[ci skip]
-
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
[ci skip]
-
Douwe Maan authored
Fix validations related to mirroring settings form. Some of our users are changing to GitLab as their main repository, it means that they're disabling the local mirror and setting up a remote mirror instead. This fix helps to avoid the extra steps required in order to achieve the desired configuration. Closes: gitlab-com/support-forum#1044 gitlab-org/gitlab-ee#1062 Related: gitlab-org/gitlab-ce#17940 Also the UI has been modify to have a single update button: #### Before ![1](/uploads/83c1d614a35911740154d4167f77f6a0/1.png) #### After ![2](/uploads/87f73a32c35d7fe83558932cdc1a21d7/2.png) See merge request !773
-
Achilleas Pipinellis authored
Fix dead link in docs README Repository size limit docs were introduced by https://gitlab.com/gitlab-org/gitlab-ee/commit/9cd2f585b0ddd74de01256d9b247245a44eaa49f Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23076 See merge request !787
-
Achilleas Pipinellis authored
Repository size limit docs were introduced by https://gitlab.com/gitlab-org/gitlab-ee/commit/9cd2f585b0ddd74de01256d9b247245a44eaa49f [ci skip]
-
- 06 Oct, 2016 17 commits
-
-
Rémy Coutable authored
CE->EE merge before 8.13.0-rc1 Conflicts resolved in the first merge: ``` UU app/models/group.rb UU app/models/member.rb UU app/models/project_team.rb UU app/services/merge_requests/update_service.rb UU app/services/notification_service.rb UU app/views/shared/_sort_dropdown.html.haml UU doc/api/oauth2.md UU lib/api/members.rb UU spec/models/merge_request_spec.rb AA spec/views/ci/lints/show.html.haml_spec.rb UU app/views/projects/commits/_head.html.haml ``` Conflicts resolved in the second merge: ``` UU app/assets/javascripts/groups_select.js UU app/assets/javascripts/labels_select.js UU app/controllers/concerns/membership_actions.rb UU app/controllers/groups/group_members_controller.rb UU app/helpers/selects_helper.rb UU app/views/admin/dashboard/index.html.haml UU app/views/shared/issuable/_form.html.haml UU app/views/shared/issuable/_label_dropdown.html.haml UU app/views/shared/issuable/_sidebar.html.haml UU config/routes.rb UU spec/services/merge_requests/merge_service_spec.rb UU spec/services/system_note_service_spec.rb ``` See merge request !772
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Achilleas Pipinellis authored
Remove duplicate integration entry Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23028 See merge request !783
-
Achilleas Pipinellis authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23028 [ci skip]
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Don't allow flay to fail. It's passing now so there's no reason to have it set to allow failure anymore. See merge request !6707
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Ruben Davila authored
Some of our users are changing to GitLab as their main repository, it means that they're disabling the local mirror and setting up a remote mirror instead. This fix helps to avoid the extra steps required in order to achieve the desired configuration.
-
Connor Shea authored
-
- 05 Oct, 2016 14 commits
-
-
Fatih Acet authored
Prevent flash alert text from being obscured when container is fluid ## What does this MR do? Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/a2af7790) that causes the text within server-initiated flash *alerts* (not flash *notices*) to be obscured when `.container-fluid` is applied. It was reported in relation to a cherry-picking flash alert, but the problem occurs with all server-initiated flash alerts contained by a fluid container. ## Are there points in the code the reviewer needs to double check? Note that as part of this fix, I combined some duplicate code and removed `.flash-text` & `.content-wrapper` selectors as they didn't seem to be necessary. I manually tested JS-initiated Flash alerts to make sure this doesn't affect their appearance. I also grepped around for anything else that might depend on these styles. Everything checked out. But... can *you* see something this is going to break? ## Why was this MR needed? Affected users can't read flash alerts. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-05_at_3.02.38_PM](/uploads/af258585e428d82dc2b293434661790b/Screen_Shot_2016-10-05_at_3.02.38_PM.png) After: ![Screen_Shot_2016-10-05_at_3.02.47_PM](/uploads/75a93235440e2b83088e66bbe53d6cee/Screen_Shot_2016-10-05_at_3.02.47_PM.png) JS-initiated flash alert (unaffected): ![Screen_Shot_2016-10-05_at_3.39.57_PM](/uploads/ba678cfaeb09c639499059712a33abe8/Screen_Shot_2016-10-05_at_3.39.57_PM.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 - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/22915 cc: @jschatz1 See merge request !6694
-
Fatih Acet authored
Updated issuable form with GL dropdowns ## What does this MR do? This adds back in the GL dropdowns into the issuable form but fixes a lot of usability issues & bugs. ## What are the relevant issue numbers? Closes #19879, #19882, #19881, #19883, #19880 ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_12.13.09](/uploads/f1df758b3fb59958b4e6b62960b81bfb/Screen_Shot_2016-08-30_at_12.13.09.png) ![Screen_Shot_2016-08-30_at_12.13.13](/uploads/6e4fd8f4d874b14eaab6b10752a19df4/Screen_Shot_2016-08-30_at_12.13.13.png) See merge request !5293
-
Fatih Acet authored
fix group links 404 ### What does this MR do? This MR should fix the 404 page, when creating a new group links without selecting any group from the group dropdown list. ### What are the relevant issue numbers? Closes #20766 See merge request !6155
-
Fatih Acet authored
-
Fatih Acet authored
-
Fatih Acet authored
Correctly parse the date of artifact expiring ## What does this MR do? Previously the JS was just replacing `-` with `/` however this was breaking when there is a timezone offset. ## What are the relevant issue numbers? Closes #19600 See merge request !6697
-
Dmitriy Zaporozhets authored
Cleanup config/routes.rb even further by extracting more routes into separate files Next step after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6692 See merge request !6698
-
Fatih Acet authored
# Conflicts: # app/assets/javascripts/dispatcher.js
-
Fatih Acet authored
-
Rémy Coutable authored
See !6474.
-
Fatih Acet authored
added 245px max height and overflow scroll-y to .grouped-pipeline-dropdown ## What does this MR do? It restricts the sub builds popup in the pipeline graph and makes it scrollable ## Are there points in the code the reviewer needs to double check? none that I know of ## Why was this MR needed? To restrict crazy CI configurations from messing with the viewport scrolling. ## Screenshots (if relevant) ![2016-10-05_16.29.35](/uploads/0ce1d8e4d46ec45e181919dd968a80cf/2016-10-05_16.29.35.gif) ## 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) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) ## What are the relevant issue numbers? Closes #22295 See merge request !6696
-
Annabel Dunstone Gray authored
19499 Update project dropdowns ## What does this MR do? Separates dropdowns on project homepage and makes caret icon consistent. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-04_at_6.20.27_PM](/uploads/76823e3836db43a60cfcabd67940659f/Screen_Shot_2016-10-04_at_6.20.27_PM.png) After: ![Screen_Shot_2016-10-04_at_6.19.52_PM](/uploads/164e40e1788b1d6a8aed29ab3348370a/Screen_Shot_2016-10-04_at_6.19.52_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) ## What are the relevant issue numbers? Closes #19499 See merge request !6687
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Rémy Coutable authored
Refactor TrendingProjectsFinder to support caching ## What does this MR do? This refactors `TrendingProjectsFinder` so it can support caching of the data. See cb7d398972d786ba7133418266fa34ae641b2497 for more details. ## Why was this MR needed? Trending projects is quite slow, easily taking seconds to load the entire page. https://gitlab.com/gitlab-org/gitlab-ce/issues/22164 https://gitlab.com/gitlab-com/infrastructure/milestones/4, in particular the section "Trending page under 2s" See merge request !6672
-