- 20 Sep, 2016 40 commits
-
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Rémy Coutable authored
Render stages in valid order Currently stages in stages dropdown on builds page are not in valid order. It is important to display stages in other those are defined in the pipeline. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21133 See merge request !6430
-
Kamil Trzcinski authored
-
Rémy Coutable authored
Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
-
Yorick Peterse authored
Use a ConnectionPool for Rails.cache on Sidekiq servers See merge request !6429
-
Jacob Schatz authored
Frontend for Merge Request Diff This merge request improves the UX for the merge request diff feature which was recently implemented here (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127). Specifically, it styles various parts of the diff feature to match the designs, it disables comment-related buttons in states where comments are disabled, and it adds a 'Show latest version' button for convenience. ## Are there points in the code the reviewer needs to double check? I could use feedback on this MR's fidelity to the design. ## Why was this MR needed? Neccessary styling improvements for basic UX of this feature, and enabled comment buttons are not functional and thus need to be disabled in certain states. ## Screenshots (if relevant) ![57dd0755f0b14342305909](/uploads/318a44a3bc8b7fc5c9c6ef92ba92e511/57dd0755f0b14342305909.gif) ## 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 - [ ] 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/21427 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127 cc: @jschatz1 See merge request !6343
-
Douwe Maan authored
Fix "Unsubscribe" link in notification emails that is triggered by anti-virus ## What does this MR do? * The unsubscribe link in an email body only unsubscribes automatically when logged in, otherwise the user is asked for a confirmation. * The unsubscribe link in an email header unsubscribes automatically whether logged in or not. ## Are there points in the code the reviewer needs to double check? This addresses all the comments from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5241, I think! ## Why was this MR needed? People were getting unsubscribed automatically by AV software. ## Screenshot ![Screen_Shot_2016-09-20_at_09.51.30](/uploads/083ee2865f1ad6c08e2ed97f1c4e7d0d/Screen_Shot_2016-09-20_at_09.51.30.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 - [ ] 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? Fixes #17198. See merge request !6223
-
James Lopez authored
-
Robert Speicher authored
Hide jump to next discussion button on commit notes ## What are the relevant issue numbers? Closes #22354 See merge request !6428
-
Paco Guzman authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
James Lopez authored
-
Rémy Coutable authored
Reduce duplication in AkismetService See merge request !6362
-
Bryce Johnson authored
-
Bryce Johnson authored
Merge branch 'merge-request-push-compare-ui' of gitlab.com:gitlab-org/gitlab-ce into merge-request-push-compare-ui
-
Douwe Maan authored
LFS support for ssh enabled ## What does this MR do? This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## 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? See merge request !6413
-
James Lopez authored
-
Phil Hughes authored
Closes #22354
-
Kamil Trzcinski authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
- Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Maximiliano Perez Coto authored
* Created a force=true param that will continue with the previous behaviour of the unsubscribe method * Created a filter for not-logged users so they see a unsubsribe confirmation page * Added the List-Unsubscribe header on emails so the email client can display it on top
-
Kamil Trzcinski authored
-
Rémy Coutable authored
Remove trailing spaces from messages in Gitlab::Regex See merge request !6426
-
Rémy Coutable authored
Fix broken spec due to last_activity_at updates being throttled In https://gitlab.com/gitlab-org/gitlab-ce/builds/4218398, the build failed because the last_activity_at column was only being updated once per hour. We can fix this spec by stubbing out the throttling and adjusting the spec to test the right event timestamp. See merge request !6424
-
Douwe Maan authored
Fix download artifacts button link ## What does this MR do? Fix download artifacts button link. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #22294 See merge request !6407
-
Lin Jen-Shin authored
* upstream/master: (80 commits) Contributing via GH no longer encouraged. Update README.md to really fix icon Update README.md to fix icon Allow to set request_access_enabled for groups and projects using API Restrict last_activity_at updates to one per hour Solve code review comments Properly support Gitlab::Auth::Result Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 Move Gitlab::Auth.Result to separate file Added CHANGELOG Fix spec failures Support pushing via SSH Fix specs failures Don't leak build tokens in build logs Fix permissions for creating container images Fix old CHANGELOG entries Add linting for duplicate CHANGELOG versions (!6039) Ensure validation messages are shown within the milestone form Fix validation regexs (+1 squashed commit) Squashed commits: [f9a9315] Use : to test invalid environment name Fix scope of the CI config key nodes in jobs entry ...
-
Stan Hu authored
In https://gitlab.com/gitlab-org/gitlab-ce/builds/4218398, the build failed because the last_activity_at column was only being updated once per hour. We can fix this spec by stubbing out the throttling and adjusting the spec to test the right event timestamp.
-
Douwe Maan authored
Use gitlab-workhorse 0.8.2 Fixes rejected API git archive extensions; improves Sentry errors. https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG See merge request !6388
-
Douwe Maan authored
Move LDAP user attributes to a method ## What does this MR do? This is a change that supports an EE fix. This small change needs to be made in CE to prevent future merge conflicts. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/736 for the EE changes. See merge request !6377
-
Robert Speicher authored
Strip comments before sending keys to gitlab-shell ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 See merge request !6381
-
Robert Speicher authored
Ensure invitees are not returned in Members API ## What are the relevant issue numbers? Closes #22065 See merge request !6370
-
Robert Speicher authored
-
Robert Speicher authored
-