- 20 Sep, 2016 21 commits
-
-
Robert Speicher authored
Hide jump to next discussion button on commit notes ## What are the relevant issue numbers? Closes #22354 See merge request !6428
-
Rémy Coutable authored
Reduce duplication in AkismetService See merge request !6362
-
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
-
Phil Hughes authored
Closes #22354
-
Kamil Trzcinski authored
-
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
-
Robert Speicher authored
Add linting for duplicate CHANGELOG entries ## What does this MR do? Extend `scripts/lint-doc.sh` so that it checks that there are no duplicate versions in CHANGELOG. See merge request !6039
-
Jacob Schatz authored
Fixed large comments messing with diff table widths ## What does this MR do? Fixes the width of the diff table so that the content inside it can't increase or decrease the width of the table cells. ## Screenshots (if relevant) ![Screen_Shot_2016-09-12_at_14.44.44](/uploads/2ca483399d867153e6ae608360ffea5f/Screen_Shot_2016-09-12_at_14.44.44.png) ## What are the relevant issue numbers? Closes #20694 See merge request !6309
-
Jacob Schatz authored
Improve build trace scroll controls ## What does this MR do? The trace step buttons now correctly scroll to the top or bottom of the build trace, rather than jumping inconsistently and never full reaching the top due to the fixed position of the header/navigation area. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Build trace UX ## Screenshots (if relevant) ![2016-09-09_20.04.32](/uploads/efee5145fb505f8c9ae2a4cf24d842d3/2016-09-09_20.04.32.gif) ## 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? Contributes to #21832. See merge request !6288
-
Jacob Schatz authored
Fixes labels multi-encode and selecting labels with single quotes ## What does this MR do? Replaced single quotes with escaped single quotes when setting item `.is-active` and when removing its field. Adds a test to test selecting 2 different labels _(one with a single quote)_ with a full page load inbetween, it checks the labels are selected as well as shown as `.is-active` in the list. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The javascript handles the url encoding when it is sent to the server so we shouldn't let the javascript begin processing an already encoded string but we needed to stop single quotes from breaking a jquery selector. ## Screenshots (if relevant) https://youtu.be/-H0_L2hV9tM ## 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 #21961 Closes #21880 Closes #21248 Closes #20759 Closes #21935 See merge request !6313
-
- 19 Sep, 2016 19 commits
-
-
Luke "Jared" Bennett authored
# Conflicts: # app/assets/javascripts/gl_dropdown.js
-
Kamil Trzcinski authored
-
Rémy Coutable authored
Allow to set request_access_enabled for groups and projects using API Closes #20978 See merge request !6359
-
Sid Sijbrandij authored
-
Sid Sijbrandij authored
-
Sid Sijbrandij authored
-
Rémy Coutable authored
Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist A customer ran into an issue where a Sidekiq task retried over and over, leading to duplicate master branches in their protected branch list. Closes #22177 See merge request !6399
-
Rémy Coutable authored
Restrict last_activity_at updates to one per hour This MR reduces the number of updates to `projects.last_activity_at` to once per hour. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22213 See merge request !6391
-
Rémy Coutable authored
Add Core Infrastructure Initiative badge to README Our Core Infrastructure Initiative Badge page: https://bestpractices.coreinfrastructure.org/projects/42 CII is a program by the Linux Foundation to track compliance with best practices in various large open source projects, we currently have a 100% passing rate for the badge. We didn't list this before, even though we probably should. I asked Sid and he said there was no reason not to add it, so here we go :) See merge request !6077
-
Felipe Artur authored
-
Yorick Peterse authored
The lock in turn is only obtained when actually needed, reducing some load on Redis. Fixes gitlab-org/gitlab-ce#22213
-
Kamil Trzcinski authored
Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b.
-
Rémy Coutable authored
Make CI to use the permission of the user who is trigger the build This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043. This also incorporates most of LFS code added in !6043 to simplify further merge. See merge request !6409
-
Rémy Coutable authored
Fix import/export database errors Fixes protected branches errors when importing a project including them Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799 See merge request !6099
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-