- 21 Sep, 2016 1 commit
-
-
Lin Jen-Shin authored
-
- 19 Sep, 2016 7 commits
-
-
Lin Jen-Shin authored
* upstream/master: Reset pushes_since_gc counter before specs run to ensure starting point is 0
-
Yorick Peterse authored
Reset pushes_since_gc counter before specs run to ensure starting point is 0 See merge request !6406
-
Lin Jen-Shin authored
* upstream/master: (97 commits) Add missing spec for ProtectedBranches::CreateService Add specs that target status failure Return created status Document how to download the latest build artifacts Clarify why GH integration is the preferred importing method Refactor GitHub importing documentation Update GitHub importer documentation to reflect current importer state Formatting fix in doc/ci/examples/README.md Refactor boards_spec.rb to avoid code duplication Replace contributions calendar timezone payload with dates Use oj gem for faster JSON processing Render invalid template for merge requests without source project and open Bump fog-aws and other dependent modules Fix API notes endpoint when posting only emoji Doesnt run JS if active element doesnt exist Add missing CHANGELOG entry Remove schema annotations completely fixed incorrect reference to @repository.root_ref in _readme.html.haml. #22083 Scrolls active tab into middle of nav on mobile MergeRequest#environments now returns an empty array when diff_head_commit is nil ...
-
Rémy Coutable authored
Render invalid template for open merge requests without source project If source project was removed and merge request for some reason wasn't closed is rendered `invalid` template. Fix !6177 Fix #22248 See merge request !6383
-
Rémy Coutable authored
Add missing spec for ProtectedBranches::CreateService While working on !6399, I noticed there was no spec for this class so I added one. See merge request !6405
-
Rémy Coutable authored
Refactor boards_spec.rb to avoid code duplication Originally created to address #21197, but !6224 solved the intermittent spec failures. See merge request !6197
-
Stan Hu authored
-
- 18 Sep, 2016 13 commits
-
-
Stan Hu authored
-
Stan Hu authored
Return created status ## What does this MR do? Properly handles status created which results in 500 when viewing Merge Request pipelines. ## 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? - Tests - [x] Added for this feature/bug - [x] 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? Closes #22286 See merge request !6404
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Achilleas Pipinellis authored
Document how to download the latest build artifacts ## What does this MR do? Document how to download the latest build artifacts. Closes gitlab-org/gitlab-ce#22273 See merge request !6401
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
Update GitHub importer documentation to reflect current importer state ## What does this MR do? Update the Github importer documentation to reflect the current importer state. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/904 ## Does this MR meet the acceptance criteria? - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !5987
-
Achilleas Pipinellis authored
improve wording on build and push images using GitLab CI docs ## What does this MR do? Improve wording on build and push images using GitLab CI docs ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Poor wording ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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 !6001
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Douglas Barbosa Alexandre authored
-
Stan Hu authored
Formatting fix in doc/ci/examples/README.md Just a tiny fix of wrongly formatted markdown link. See merge request !6398
-
sknebel authored
-
- 17 Sep, 2016 4 commits
-
-
Achilleas Pipinellis authored
docs: fix typo, it should refer to `domain_blacklist_enabled` setting ## What does this MR do? fix the documentation ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? typo fix ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? yes, it's just a typo fix in the documentation without any code or business logic changes See merge request !5899
-
Achilleas Pipinellis authored
Document IAM Profile AWS S3 configuration key. ## What does this MR do? Document additional parameters available to the backup rake job configuration. ## Are there points in the code the reviewer needs to double check? Probably not. ## Why was this MR needed? Un-documented configuration options ## What are the relevant issue numbers? #12756 ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) See merge request !5910
-
Stan Hu authored
Originally created to address #21197, but !6224 solved the intermittent spec failures.
-
Jacob Schatz authored
Fix line diff side-by-side line highlighting ## What does this MR do? Fixes line highlighting in diff side-by-side view from working correctly. The JS was looking for a class, but the class doesn't exist & instead it was a data attribute. ## Screenshots (if relevant) ![Screen_Shot_2016-09-13_at_10.26.15](/uploads/7aca730efb14d7bd6bad2a8712fe39d2/Screen_Shot_2016-09-13_at_10.26.15.png) See merge request !6316
-
- 16 Sep, 2016 15 commits
-
-
Jacob Schatz authored
Scrolls active tab into middle of nav on mobile ## What does this MR do? On mobile (or smaller screens) it scrolls the currently active tab into the middle of the nav. ## Screenshots (if relevant) ![Screen_Shot_2016-09-15_at_09.38.55](/uploads/4170271b53b9509a385fa7844fb3dc78/Screen_Shot_2016-09-15_at_09.38.55.png) See merge request !6363
-
Jacob Schatz authored
Simplified the CSS for issue boards ## What does this MR do? It gained a lot of extra cruft through the different improvements etc. This removes a lot of the stuff which would hopefully also speed up the browser rendering. - Removed flexbox from a lot of things which in turn reduces it's complexity. - Removed styles that either aren't used or aren't needed. - Various other improvements to the CSS. Basically just improved the CSS by removing overly complex CSS. There are no visible changes to issue boards, just less CSS for the same results. See merge request !6352
-
Jacob Schatz authored
Fixed commit search UI ## What does this MR do? Fixes the UI for commits in search. If the scope of the search is commits then it renders the list in a `ul` to match the same styling as that on the commits UI. ## Screenshots (if relevant) ![Screen_Shot_2016-09-05_at_15.30.12](/uploads/f567a224be44d5a9b015ac5d1c399bd7/Screen_Shot_2016-09-05_at_15.30.12.png) ## What are the relevant issue numbers? Closes #21868 See merge request !6205
-
Jacob Schatz authored
Fix anchor icon regression An error in scss prevented the markdown header `:hover` anchor icon svg from linking correctly: ![Screen_Shot_2016-09-14_at_4.06.19_PM](/uploads/f4d31a17a58bd7cbde572f91c316dfe1/Screen_Shot_2016-09-14_at_4.06.19_PM.png) The following currently 404s: <https://gitlab.com/assets/icon_anchor.svg> ## What are the relevant issue numbers? #20459 & !5577 See merge request !6358
-
Jacob Schatz authored
Replace contributions calendar timezone payload with dates ## What does this MR do? Fixes a ~regression bug introduced in !5784 whereby the calendar squares would not render due to a timezone mismatch between the server timezone and the browser (user) timezone. I am now returning the dates instead of the timezone from the backend. There's a good chance we will still have a calendar off by one error (which is an existing issue #1943) but passing dates should make sure that the calendar activity squares render correctly across timezones. ## Are there points in the code the reviewer needs to double check? Double check that this displays the correct calendar squares when the GitLab instance is hosted in a different timezone than the user viewing it ## Why was this MR needed? Fixes ~regression issue
😞 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-13_at_9.47.06_PM](/uploads/d8b41b9b43320f021452e39f29b0e194/Screen_Shot_2016-09-13_at_9.47.06_PM.png) After: ![Screen_Shot_2016-09-13_at_9.46.11_PM](/uploads/e09a3b35eef77ee1cf73b924c3815d3a/Screen_Shot_2016-09-13_at_9.46.11_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 [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? Closes #21921 See merge request !6336 -
Clement Ho authored
-
Yorick Peterse authored
Use oj gem for faster JSON processing See merge request !6395
-
Ahmad Sherif authored
It's mainly intended to improve Elasticsearch indexing performance (through multi_json gem), but other gems could benefit from it too, like grape.
-
Rémy Coutable authored
Bump fog-aws and other dependent modules fog-aws CHANGELOG: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md Notable improvements: * Support for ap-south-1 region * Fix for empty ETag values Closes #22260 See merge request !6392
-
Katarzyna Kobierska authored
-
Rémy Coutable authored
Merge branch '22256-nomethoderror-api-entities-note-missing-attribute-note-on-awardemoji-0x00000015142480' into 'master' Fix API notes endpoint when posting only emoji Closes #22256 See merge request !6387
-
Stan Hu authored
Closes #22260
-
Z.J. van de Weg authored
-
Stan Hu authored
MergeRequest#environments now returns an empty array when diff_head_commit is nil ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed for a bug introduced in an RC. - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] 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) - [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 #22246 See merge request !6379
-
Phil Hughes authored
-