- 06 Dec, 2016 10 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
* upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
-
Sean McGivern authored
GLM shorthand reference for projects from the same namespace Closes #21679 See merge request !7255
-
Sean McGivern authored
Authorize users into imported GitLab project https://gitlab.com/gitlab-com/support-forum/issues/1313 See merge request !7936
-
Jacob Schatz authored
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:  AFTER:  cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900
-
Robert Speicher authored
-
Douwe Maan authored
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
-
Douwe Maan authored
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
-
- 05 Dec, 2016 30 commits
-
-
Jacob Schatz authored
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
-
Jacob Schatz authored
Remove unused votes.scss `.votes-inline` isn't being used anywhere See merge request !7934
-
Achilleas Pipinellis authored
NIGNX -> Nginx This shouldn't be in all caps, and it should be spelled correctly! See merge request !7929
-
Achilleas Pipinellis authored
It's secret variables, not secure See merge request !7939
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
Refactor CI variables docs See merge request !7751
-
Achilleas Pipinellis authored
[ci skip]
-
Alfredo Sumaran authored
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  ### After  ## 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
-
Ahmad Sherif authored
-
Allison Whilden authored
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
-
Chris Peressini authored
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
-
Alfredo Sumaran authored
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
-
Dmitriy Zaporozhets authored
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
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Alfredo Sumaran authored
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.  cc: @filipa @ClemMakesApps Closes #25221 See merge request !7917
-
Rémy Coutable authored
Use pry-byebug instead byebug See merge request !7925
-
Ryan Harris authored
Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button
-
Sean McGivern authored
This shouldn't be in all caps, and it should be spelled correctly!
-
Jacob Schatz authored
Reduce base font sizes across app by 1px Looking at other websites that use system fonts, the default seems to be `14px`. We currently use `15px` which feels a little too big at the moment (in my opinion). This is just an idea so feel free to close it @awhildy
😄 Before:  After:  See merge request !7905 -
Sean McGivern authored
change the date label to match the date used Closes #1608 See merge request !7860
-
Sean McGivern authored
Bump ruby version to 2.3.3 Part of gitlab-org/gitlab-ce#24629 See merge request !7904
-
Rémy Coutable authored
Use the pagination helper in the API See merge request !7920
-
Rémy Coutable authored
Update paranoia from 2.1.4 to 2.2.0. Working toward #14286. Includes support for Rails 5. Changelog: https://github.com/rubysherpas/paranoia/blob/879fd18caa46af70fceca2e8f46886b3eff072ec/CHANGELOG.md#220-2016-10-21 See merge request !7922
-
-
Fatih Acet authored
Fix compatibility with Internet Explorer 11 for merge requests ## What does this MR do? This merge request restores the compatibility with Internet Explorer 11. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Commit ca3c0c6c introduced an incompatibility with Internet Explorer 11. On all merge requests in all projects the 'Changes' tab does not display the changes in IE11 but instead fails with 'Something went wrong on our end'. The reason ist, that this code snipped produces different results on Firefox and Internet Explorer 11: ``` var element = document.createElement('a'); element.href = '/some/absolute/url'; alert(element.pathname); ``` With Internet Explorer 11 the alert will print a relative path, whereas with Firefox the alert will print an absolute path. For GitLab this meant that a wrong AJAX URL was composed which resulted in a 404. ## Screenshots (if relevant) None. ## Does this MR meet the acceptance criteria? - [X] [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 - [X] Added for this feature/bug - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23977 #24380 See merge request !7525
-
Kamil Trzciński authored
Rename MWBS service to Merge When Pipeline Succeeds ## What does this MR do? This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing ## What are the relevant issue numbers? Closes #23354 See merge request !7135
-
Kamil Trzciński authored
Accept `issue new` as command to create an issue Checkout commit message: 629eb073c2056d0e4d87aefea83d5d384465bee6 cc @pedroms See merge request !7787
-
Steffen Rauh authored
-
Z.J. van de Weg authored
Now only `/trigger issue create` is a valid command, but our UI shows Issue new everywhere. The default now will be `/trigger issue new`. The help message is adjusted to reflect this. Fixes: gitlab-org/gitlab-ce#25025
-
