summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobileLuke Bennett2016-09-093-2/+11
|
* Removed media query declaration relating to merge-request-info and issue-infoLuke Bennett2016-09-071-4/+0
|
* Merge branch '15571-api-for-ci-lint' into 'master' Rémy Coutable2016-09-079-9/+172
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API for CI Lint ## What does this MR do? Add API for CI Lint. Can check if `.gitlab-ci.yml` content is valid. ## What are the relevant issue numbers? Closes #15571 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - [x] Documentation - Tests - [x] Added for this feature/bug - [x] All builds are passing cc @ubudzisz @grzesiek @yorickpeterse See merge request !5953
| * Improve curl commend, remove blank linesKatarzyna Kobierska2016-09-072-3/+1
| |
| * Fix invalid curl commandKatarzyna Kobierska2016-09-073-44/+8
| |
| * Improve documentation grammarKatarzyna Kobierska2016-09-071-2/+2
| |
| * Improve documentationKatarzyna Kobierska2016-09-071-24/+65
| |
| * Rename file and update READMEKatarzyna Kobierska2016-09-073-3/+2
| |
| * Move ci_lint to api/ciKatarzyna Kobierska2016-09-073-2/+2
| |
| * Add Documentation to Ci Lint APIKatarzyna Kobierska2016-09-073-4/+51
| |
| * Code refactorKatarzyna Kobierska2016-09-075-10/+9
| |
| * Improve codeKatarzyna Kobierska2016-09-074-29/+25
| |
| * Code refactoringKatarzyna Kobierska2016-09-076-62/+67
| |
| * Fix errors and grammarKatarzyna Kobierska2016-09-073-25/+23
| |
| * Fix rubocop errorsKatarzyna Kobierska2016-09-072-2/+2
| |
| * Change class method nameKatarzyna Kobierska2016-09-075-15/+16
| |
| * Add class method to encapsulate exceptionKatarzyna Kobierska2016-09-074-21/+47
| |
| * Add tests for yaml content with errorsKatarzyna Kobierska2016-09-071-11/+17
| |
| * Move lint to api from ci/apiKatarzyna Kobierska2016-09-076-44/+47
| |
| * Add params requires to lintKatarzyna Kobierska2016-09-073-44/+35
| |
| * Fix rubocop testsKatarzyna Kobierska2016-09-072-3/+2
| |
| * Add tests for API CI LintKatarzyna Kobierska2016-09-073-24/+59
| |
| * API for CI LintKatarzyna Kobierska2016-09-074-0/+55
| |
* | Merge branch 'master' into 'master' Rémy Coutable2016-09-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #21440: Small fix to curl example for adding member to project ## What does this MR do? Two lines changed in docs to move the user_id field out of the url and onto the query string ## Why was this MR needed? Issue #21440 reported under Issues. The documentation example for adding members to a project had a slight problem. ## What are the relevant issue numbers? Closes #21440. See merge request !6236
| * | Issue #21440: Fix to curl example for adding member to projectJonny McCullagh2016-09-061-2/+2
| | |
* | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-09-071-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | Gitlab -> GitLab ## What does this MR do? Fix GitLab capitalization See merge request !6235
| * | Gitlab -> GitLabBen Bodenmiller2016-09-061-1/+1
| |/
* | Merge branch 'created-icon' into 'master' Fatih Acet2016-09-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lighten color of created icon #### What does this MR do? Changes `created` icon color to lighter gray #### Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_10.25.19_AM](/uploads/6543d0004d817adcbe13cc2b23b6b7bb/Screen_Shot_2016-09-06_at_10.25.19_AM.png) cc @dimitrieh See merge request !6230
| * | Lighten color of created iconcreated-iconAnnabel Dunstone Gray2016-09-061-1/+1
| | |
* | | Merge branch 'feature/fork-to-group-api' into 'master' Rémy Coutable2016-09-074-3/+85
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add the ability to fork to a specific namespace Browser interface allows forking to an owned grup. This commit brings API up to speed by providing optional namespace parameter to fork API. This allows forking to users and groups under forker's control using their id or unique name. Fixes #21591 ## 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 - [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) See merge request !6213
| * | Merge branch 'master' into feature/fork-to-group-apiOlaf Tomalka2016-09-0637-203/+293
| |\ \ | |/ / |/| |
* | | Merge branch ↵Annabel Dunstone Gray2016-09-061-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-height' into 'master' Changed `.commit-row-title` `line-height` to `1.35` from `1` ## What does this MR do? Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Not enough space between commit lines ## What are the relevant issue numbers? Closes #18851. ## Screenshots (if relevant) New screenshot below. ## 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 [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) Closes #18851 See merge request !5996
| * | | Changed `.commit-row-title` `line-height` to `1.35` from `1`18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-heightLuke Bennett2016-09-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed `margin-bottom` Corrected commit-actions margin Reverted action margin for a more logical approach
* | | | Merge branch 'improve-vuejs-resource-interceptor' into 'master' Fatih Acet2016-09-061-6/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce intermittent spec failures by making VueJS resource interceptor decrement outstanding resource counts when HTTP response is received Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response. Partial fix to #21197 and other intermittent spec failures. See merge request !6224
| * | | Reduce intermittent spec failures by making VueJS resource interceptorimprove-vuejs-resource-interceptorStan Hu2016-09-061-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decrement outstanding resource counts when HTTP response is received Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response. Partial fix to #21197 and other intermittent spec failures.
* | | | Merge branch 'cleanup-mislignments-issue-list-view' into 'master' Annabel Dunstone Gray2016-09-063-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increased checkbox and filter button padding ## What does this MR do? fixed misalignments as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/19110 ## Are there points in the code the reviewer needs to double check? Not that I know of ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/19110 ## Screenshots (if relevant) ![image](/uploads/e7c5ffe78e1a5b67fa0335ba1c231df2/image.png) ![image](/uploads/1591ed872e765da3b5ed071c8872194f/image.png) ## 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) - [x] 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/19110 See merge request !6206
| * | | | added to Changelogcleanup-mislignments-issue-list-viewDimitrie Hoekstra2016-09-051-0/+1
| | | | |
| * | | | increased checkbox and filter button paddingDimitrie Hoekstra2016-09-052-2/+2
| | | | |
* | | | | Merge branch 'change-checkout-locally-url' into 'master' Rémy Coutable2016-09-062-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "check out, review, and merge locally" URL to SSH by default. ## What does this MR do? Change the default URL type in the "Check out, review, and merge locally" pop-up dialog to SSH. ## Why was this MR needed? The default URL to show on the project screen is the SSH URL, so it makes sense for it to be the default here too. Plus, since most people (hopefully) use SSH keys to avoid typing credentials repeatedly, changing this default means these commands can be pasted into a terminal more easily since no password prompt will get in the way. ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [n/a ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [n/a] API support added - Tests - [n/a] 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) See merge request !6211
| * | | | | Change "check out, review, and merge locally" URL to use default clone protocol.Judson Neer2016-09-062-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the default protocol here (vs HTTP only) is more convenient when it comes to pasting these commands into a terminal.
* | | | | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-062-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated gitlab_git to 10.6.3 ## What does this MR do? This updated gitlab_git to 10.6.3 ## 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 [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? See merge request !6132
| * | | | | | Updated gitlab_git to 10.6.3Yorick Peterse2016-09-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of https://gitlab.com/gitlab-org/gitlab_git/merge_requests/121.
* | | | | | | Merge branch 'zj-gitorious-migration-empty-pg-database' into 'master' Rémy Coutable2016-09-061-2/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support empty PG database too cc @rdavila @axil See merge request !6221
| * | | | | | Support empty PG database toozj-gitorious-migration-empty-pg-databaseZ.J. van de Weg2016-09-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First check if there is a result on the migration, else there is nothing to do
* | | | | | | Merge branch '20321-handle-long-variable-values-better' into 'master' Rémy Coutable2016-09-066-11/+45
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle variable values ## What does this MR do? User can display variables on click. Variables will hide after page is refresh. ## What are the relevant issue numbers? Closes #20321 ## Screenshots (if relevant) ![Zrzut_ekranu_z_2016-08-23_16_32_29](/uploads/649576b5c77fc4636924de00ddb0f190/Zrzut_ekranu_z_2016-08-23_16_32_29.png) ![Zrzut_ekranu_z_2016-09-01_17_59_40](/uploads/7e96210b9c8354f0b406b9df8018a94c/Zrzut_ekranu_z_2016-09-01_17_59_40.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] 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) cc: @kradydal @grzesiek @yorickpeterse [@chastell](https://github.com/chastell) @tmaczukin See merge request !5628
| * | | | | | remove css selectorsubudzisz2016-09-062-11/+10
| | | | | | |
| * | | | | | improve code after reviewubudzisz2016-09-062-2/+2
| | | | | | |
| * | | | | | add feature testubudzisz2016-09-067-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature test add feature test add feature test remove test to builds_spec remove feature test to builds_spec remove feature test to builds_spec add changes to methods and remove FactoryGirl add changes to methods and remove FactoryGirl adding changes to test and js file changes grammar update changelog rename file name update files after review update files after review update files after review
| * | | | | | add js fileubudzisz2016-09-065-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show variables on-click show variables on-click show variables on-click remove = and add new js classes into sidebar.scss show variables by clicking button show variables by clicking button show variables by clicking button show variables by clicking button use id for a class add nicescroll add nicescroll
| * | | | | | render only commit titleubudzisz2016-09-061-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | update CHANGELOG
View Lorry Controller Status