summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Restore legacy statuses support in ci status helpersGrzegorz Bizon2016-12-061-0/+4
| | | | | | | | |
| * | | | | | | | Add support for detailed status to status helpersGrzegorz Bizon2016-12-053-24/+36
| | | | | | | | |
| * | | | | | | | Expose pipeline detailed status using status factoryGrzegorz Bizon2016-12-052-0/+74
| | | | | | | | |
| * | | | | | | | Extend tests for pipeline status factoryGrzegorz Bizon2016-12-051-3/+16
| | | | | | | | |
| * | | | | | | | Implement pipeline status factory with extended statusGrzegorz Bizon2016-12-052-0/+76
| | | | | | | | |
| * | | | | | | | Fold core/extended status modules to reduce nestingGrzegorz Bizon2016-12-0523-60/+54
| | | | | | | | |
| * | | | | | | | Implement extended pipeline - status with warningsGrzegorz Bizon2016-12-022-0/+77
| | | | | | | | |
| * | | | | | | | Add implementation of common pipeline extended statusGrzegorz Bizon2016-12-023-4/+28
| | | | | | | | |
| * | | | | | | | Add information about badge test to core statusesGrzegorz Bizon2016-12-0215-0/+60
| | | | | | | | |
| * | | | | | | | Add scaffold for remaining statuses-related classesGrzegorz Bizon2016-12-028-0/+64
| | | | | | | | |
| * | | | | | | | Implement the rest of core CI statuses with specsGrzegorz Bizon2016-12-0215-8/+160
| | | | | | | | |
| * | | | | | | | Add abstract base class for core CI statusGrzegorz Bizon2016-12-023-1/+44
| | | | | | | | |
| * | | | | | | | Add initial implmentation for core success statusGrzegorz Bizon2016-12-022-0/+18
| | | | | | | | |
| * | | | | | | | Add scaffold for each class of core CI statusGrzegorz Bizon2016-12-027-0/+56
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-extended-regexp' into 'master' Rémy Coutable2016-12-061-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `--extended-regexp` in lint-doc for compatibility with Darwin grep Now it should work on all platforms. See merge request !7943
| * | | | | | | | | Use `--extended-regexp` in lint-doc for compatibility with Darwin greprs-extended-regexpRobert Speicher2016-12-061-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-0641-286/+1022
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255
| * | | | | | | | | Update user markdown docs with cross-project shorthand versionOswaldo Ferreira2016-12-021-0/+12
| | | | | | | | | |
| * | | | | | | | | Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-0240-286/+1010
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/authorize-users-into-imported-gitlab-project' into 'master' Sean McGivern2016-12-063-2/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Authorize users into imported GitLab project https://gitlab.com/gitlab-com/support-forum/issues/1313 See merge request !7936
| * | | | | | | | Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-projectAhmad Sherif2016-12-053-2/+14
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz2016-12-062-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MR widget content wrapping for XS viewports Centers the "Accept Merge Request" button within the MR widget (and adds a bit of right/left padding) for viewports smaller than 768px. BEFORE: ![Screen_Shot_2016-12-02_at_8_53_01_AM](/uploads/fcdae5302a1407090483dd3cff868c51/Screen_Shot_2016-12-02_at_8_53_01_AM.png) AFTER: ![Screen_Shot_2016-12-02_at_9_43_37_AM](/uploads/f7d1dce082b79d263f05cea3c90e870a/Screen_Shot_2016-12-02_at_9_43_37_AM.png) cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900
| * | | | | | | | Fixed MR widget content wrapping for XS viewportsRyan Harris2016-12-052-0/+10
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button
* | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-12-065-16/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CHANGELOG.md for 8.13.8Alejandro Rodríguez2016-12-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Update CHANGELOG.md for 8.14.3Alejandro Rodríguez2016-12-025-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'issue_25064' into 'security' Douwe Maan2016-12-063-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure state param has a valid value when filtering issuables. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25064 This fix makes sure we only call safe methods on issuable when filtering by state. See merge request !2038
* | | | | | | | | Merge branch 'document-public-project-api' into 'master' Douwe Maan2016-12-061-4/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the public Project API and document `GET /projects/:id/users` Documentation was not updated in !7843. Also the `GET /projects/:id/users` endpoint was not documented at all! See merge request !7897
| * | | | | | | | | Document the public Project API and document `GET /projects/:id/users`document-public-project-apiRémy Coutable2016-12-021-4/+44
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'remove-errors-scss' into 'master' Jacob Schatz2016-12-051-16/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused errors css `.error-page` isn't being used anywhere as far as I can see so I removed it See merge request !7933
| * | | | | | | | | Remove unused errors cssremove-errors-scssAnnabel Dunstone Gray2016-12-051-16/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'remove-votes-scss' into 'master' Jacob Schatz2016-12-051-4/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused votes.scss `.votes-inline` isn't being used anywhere See merge request !7934
| * | | | | | | | | | Remove unused votes.scssremove-votes-scssAnnabel Dunstone Gray2016-12-051-4/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix-nignx-typo' into 'master' Achilleas Pipinellis2016-12-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NIGNX -> Nginx This shouldn't be in all caps, and it should be spelled correctly! See merge request !7929
| * | | | | | | | | | NIGNX -> Nginxfix-nignx-typoSean McGivern2016-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't be in all caps, and it should be spelled correctly!
* | | | | | | | | | | Merge branch 'docs/secret-variables' into 'master' Achilleas Pipinellis2016-12-051-11/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's secret variables, not secure See merge request !7939
| * | | | | | | | | | | It's secret variables, not secureAchilleas Pipinellis2016-12-051-11/+11
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'docs/refactor-ci-variables' into 'master' Achilleas Pipinellis2016-12-053-61/+218
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor CI variables docs See merge request !7751
| * | | | | | | | | | | Fix dead links, add example of debug trace output, simplify titlesAchilleas Pipinellis2016-12-052-27/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | Refactor CI variables docsdocs/refactor-ci-variablesAchilleas Pipinellis2016-11-253-49/+86
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'feature/admin-user-groups-link' into 'master' Alfredo Sumaran2016-12-053-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the 'Group projects' links clickable in the admin screens ## What does this MR do? This MR makes the group links within the 'users' section of the admin interface clickable. Currently, to view the details of groups a user is a member of, you have to go back to the 'groups' tab (which isn't ideal). ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? It's a UX improvement - it saves going back to the 'groups' a user is a member of and then clicking the group to view the group details. ## Screenshots (if relevant) ### Before ![Screenshot_from_2016-11-21_14-25-01](/uploads/2a6b75efd4c700e5760c64f0db17e847/Screenshot_from_2016-11-21_14-25-01.png) ### After ![Screenshot_from_2016-11-21_14-24-42](/uploads/9be288c1d9e4cf818c96e11e24790860/Screenshot_from_2016-11-21_14-24-42.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 !7620
| * | | | | | | | | | | | The admin user projects view now has a clickable group linkJames Gregory2016-12-023-1/+33
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'add-button-styles-ux-guide' into 'master' Allison Whilden2016-12-0535-35/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document button secondary states ## What does this MR do? Document the changes from #24145 and !7797. It also updates the icons and color section in the basics page. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? #24145 cc @awhildy See merge request !7924
| * | | | | | | | | | | | | Document button secondary states. Update icons and color sectionChris Peressini2016-12-0535-35/+36
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe hover, focus and active states for primary and secondary buttons. Organized the icons section in a table. Replaced images for icons so they are all the same size. Organized the color section in a table. Replaced the images with new ones so the table would have a more manageable size. Updated the values for some colors to show the $color-light shade. Remove commented sections Remove `db/schema.rb` Add db/schema.rb from origin/master Fix typos
* | | | | | | | | | | | | Merge branch 'add-element-extensions-tests' into 'master' Alfredo Sumaran2016-12-051-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added element extensions spec for .matches and .closest ## What does this MR do? Adds tests for `Element.prototype.matches` and `Element.prototype.closest`. ## 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 entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 !7755
| * | | | | | | | | | | | Added element extensions spec for .matches and .closestadd-element-extensions-testsLuke "Jared" Bennett2016-12-021-0/+38
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'refactor-create-service-spec' into 'master' Dmitriy Zaporozhets2016-12-052-106/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor create service spec ## What does this MR do? Use let instead instance variables to cache create user operation. Union some example into one. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Time before: 1 minute 11.81 seconds Time after: 52.47 seconds - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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 !7609
| * | | | | | | | | | | | Refactor create service specSemyon Pupkov2016-11-222-106/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: 1 minute 11.81 seconds after: 52.47 seconds
* | | | | | | | | | | | | Merge branch '25221-fix-build-status-overflow-mobile' into 'master' Alfredo Sumaran2016-12-052-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed top margin for Builds page status header information Adds top margin for the Build Status content area for screens smaller than 768px. Especially needed when the text content wraps onto a third line. ![Untitled-1](/uploads/57a0a58f1fe647cd2d0dbb8849621340/Untitled-1.jpg) cc: @filipa @ClemMakesApps Closes #25221 See merge request !7917
| * | | | | | | | | | | | | Added changelog for #25221Ryan Harris2016-12-031-0/+4
| | | | | | | | | | | | | |