summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix specs failuresreview-appsKamil Trzcinski2016-09-191-1/+1
|
* Fix validation regexs (+1 squashed commit)Kamil Trzcinski2016-09-194-7/+7
| | | | | Squashed commits: [f9a9315] Use : to test invalid environment name
* Fix scope of the CI config key nodes in jobs entryGrzegorz Bizon2016-09-191-13/+13
|
* Fix environments handlingKamil Trzcinski2016-09-192-4/+3
|
* Restore validation of CI job environment nameGrzegorz Bizon2016-09-191-0/+9
|
* Fix CI job environment configuration attributesGrzegorz Bizon2016-09-194-5/+7
|
* Fix CI job environment configuration entry classGrzegorz Bizon2016-09-191-8/+11
|
* Small refactor of review apps docsAchilleas Pipinellis2016-09-191-38/+28
|
* Cleanup changesKamil Trzcinski2016-09-194-41/+8
|
* Added documentation about dynamic environmentsKamil Trzcinski2016-09-192-1/+30
|
* Added missing db/schema changesKamil Trzcinski2016-09-191-1/+2
|
* Update support for dynamic environmentsKamil Trzcinski2016-09-197-32/+49
|
* Verify expandability of variables defined as part of environmentKamil Trzcinski2016-09-195-13/+134
|
* Properly create deployment using all possible optionsKamil Trzcinski2016-09-192-7/+17
|
* Add validation of URL and validation of nameKamil Trzcinski2016-09-192-0/+35
|
* Add new CI configuration entry for the environmentGrzegorz Bizon2016-09-194-10/+157
|
* Add support for dynamic environmentsKamil Trzcinski2016-09-198-5/+139
| | | | Environments that can have a URL with predefined CI variables.
* Merge branch '22286-fix-missing-status' into 'master' Stan Hu2016-09-183-9/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add specs that target status failure22286-fix-missing-statusKamil Trzcinski2016-09-182-8/+11
| |
| * Return created statusKamil Trzcinski2016-09-181-1/+1
|/
* Merge branch 'doc/download-latest-artifact' into 'master' Achilleas Pipinellis2016-09-182-0/+32
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Document how to download the latest build artifactsAchilleas Pipinellis2016-09-182-0/+32
| | | | | | | | [ci skip]
* | Merge branch 'update-github-doc-page' into 'master' Achilleas Pipinellis2016-09-184-35/+94
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Clarify why GH integration is the preferred importing methodAchilleas Pipinellis2016-09-181-4/+5
| | |
| * | Refactor GitHub importing documentationAchilleas Pipinellis2016-09-184-44/+92
| | |
| * | Update GitHub importer documentation to reflect current importer stateDouglas Barbosa Alexandre2016-09-181-0/+10
| |/
* | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-09-181-3/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * improve wording on build and push images using GitLab CIBen Bodenmiller2016-08-251-3/+3
| |
* | Merge branch 'patch-5' into 'master' Stan Hu2016-09-181-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Formatting fix in doc/ci/examples/README.md Just a tiny fix of wrongly formatted markdown link. See merge request !6398
| * | Formatting fix in doc/ci/examples/README.mdsknebel2016-09-181-1/+1
|/ /
* | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-09-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | docs: fix typo, it should refer to `domain_blacklist_enabled` settingBenjamin Schwarze2016-08-191-1/+1
| | |
* | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-09-171-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove whitespace.Geoff Webster2016-08-191-1/+0
| | | |
| * | | Document IAM Profile AWS S3 configuration key. Geoff Webster2016-08-191-0/+7
| | | |
* | | | Merge branch 'diff-line-highlighting-fix' into 'master' Jacob Schatz2016-09-171-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix line diff side-by-side line highlightingdiff-line-highlighting-fixPhil Hughes2016-09-131-2/+2
| | | | |
* | | | | Merge branch 'scrolling-tabs-center-mobile' into 'master' Jacob Schatz2016-09-162-3/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Doesnt run JS if active element doesnt existscrolling-tabs-center-mobilePhil Hughes2016-09-161-6/+9
| | | | | |
| * | | | | Scrolls active tab into middle of nav on mobilePhil Hughes2016-09-162-3/+20
| | | | | |
* | | | | | Merge branch 'issue-boards-css-simplify' into 'master' Jacob Schatz2016-09-161-75/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Removed more flexboxissue-boards-css-simplifyPhil Hughes2016-09-151-5/+3
| | | | | | |
| * | | | | | Fixed styling issue with PhantomJS causing builds to failPhil Hughes2016-09-151-1/+1
| | | | | | |
| * | | | | | Fixed height issue on smaller screensPhil Hughes2016-09-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed IE width issue
| * | | | | | Simplified the CSS for issue boardsPhil Hughes2016-09-151-71/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch 'search-commit-ui-fix' into 'master' Jacob Schatz2016-09-162-8/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Fixed commit search UIsearch-commit-ui-fixPhil Hughes2016-09-052-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21868
* | | | | | | | Merge branch 'fix-anchor-icon' into 'master' Jacob Schatz2016-09-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | fix anchor icon regression introduced in 2fd6472 (!5577)fix-anchor-iconMike Greiling2016-09-151-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-reduce-contributions-calendar-payload' into 'master' Jacob Schatz2016-09-166-13/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :disappointed: ## 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