summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds btn-transparent class in correct place due to changes in master22635-clipboard-iconFilipa Lacerda2016-10-111-1/+1
|
* Adds entry to CHANGELOGFilipa Lacerda2016-10-111-0/+1
|
* Fixes padding in all clipboard icons that have .btn classFilipa Lacerda2016-10-111-1/+1
|
* Merge branch 'empty-mrs' into 'master' Rémy Coutable2016-10-117-49/+71
|\ | | | | | | | | | | | | Allows empty merge requests for a workflow described in gitlab-org/gitlab-ce#14606 Closes gitlab-org/gitlab-ce#14606 See merge request !6384
| * Allow empty merge requestsArtem Sidorenko2016-10-117-49/+71
| |
* | Merge branch 'reserve-robots-txt-namespace' into 'master' Robert Speicher2016-10-111-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add `robots.txt` to the list of reserved namespaces See #22759 See merge request !6789
| * | Add `robots.txt` to the list of reserved namespacesNick Thomas2016-10-111-0/+1
| | |
* | | Merge branch 'sh-update-mailroom' into 'master' Robert Speicher2016-10-112-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump mail_room to v0.8.1 to fix thread cleanup issue See https://github.com/tpitale/mail_room/blob/master/CHANGELOG.md Closes #20273 See merge request !6788
| * | | Bump mail_room to v0.8.1 to fix thread cleanup issuesh-update-mailroomStan Hu2016-10-102-1/+2
| |/ / | | | | | | | | | Closes #20273
* | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-1110-167/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove NamespacesController * removes unnecessary NamespacesController. The main purpose of this controller was redirect to group or user page when URL like https://gitlab.com/gitlab-org was used. Now this functionality is handled by constrainers (like this https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/routes/user.rb#L17-21) and take user to correct controller right from the start. * serve non existing API routes like `/api/v3/whatever` with Grape instead of Rails. Before this change wrong API url was served by rails with not obvious 404, 405 & 500 errors See merge request !6733
| * | | Fix duplicate entry in CHANGELOGdz-cleanup-routingDmitriy Zaporozhets2016-10-101-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Better wording in API readmeDmitriy Zaporozhets2016-10-101-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix api users spec for post request with invalid idDmitriy Zaporozhets2016-10-101-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Replace undefined Grape routing code from 400 to 404Dmitriy Zaporozhets2016-10-105-30/+33
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix API specs behaviour for invalid routingDmitriy Zaporozhets2016-10-104-20/+51
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Catch any undefined API routing and return 400 Bad RequestDmitriy Zaporozhets2016-10-103-3/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Update git over http test to match new routingDmitriy Zaporozhets2016-10-101-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove NamespacesControllerDmitriy Zaporozhets2016-10-103-145/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The main purpose of this controller was redirect to group or user page when URL like https://gitlab.com/gitlab-org was used. Now this functionality is handled by contrainers and take user to correct controller right from the start Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch '23118-use-one-style-of-naming-js-files' into 'master' Fatih Acet2016-10-115-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formatted all app/assets/javascripts to underscore naming convention ## What does this MR do? Changes all javascript file names to user underscores as delimiter. This will be enforced in the docs in a different MR !6782. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Consistency. ## Screenshots (if relevant) ## 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 [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? Closes #23118 See merge request !6783
| * | | Formatted all app/assets/javascripts to underscore naming convention23118-use-one-style-of-naming-js-filesLuke Bennett2016-10-105-0/+0
| | | |
* | | | Merge branch 'simplify-compare-page-text' into 'master' Fatih Acet2016-10-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions' ## What does this MR do? I remember we had a quick discussion about what to call the expected input of the compare page. Today whilst doing !6766 I found these are called [git revisions](https://git-scm.com/docs/gitrevisions). ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_14.44.13](/uploads/694200b8f56967d8e7caa965bbf7c123/Screen_Shot_2016-10-10_at_14.44.13.png) Dunno where that gradient came :laughing: Screenshot issue not code. ## 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 [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 !6774
| * | | | Changed 'Compare branches, tags or commit ranges' to 'Compare Git revisions'simplify-compare-page-textLuke Bennett2016-10-101-1/+1
| |/ / /
* | | | Merge branch '20356-network-commit-hash-input-placeholder-corrections' into ↵Fatih Acet2016-10-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changed network input placeholder to 'Git revision' ## What does this MR do? Changes the commit SHA-1 input placeholder on the network page to `Git revision`. ([as defined here](https://git-scm.com/docs/gitrevisions)) ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Placeholder was too complex ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_15.06.23](/uploads/e31586b0f7a973b04e55e73223a2a95c/Screen_Shot_2016-10-10_at_15.06.23.png) ## 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 [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? Closes #20356 See merge request !6766
| * | | | Changed placeholder to 'Commit hash'20356-network-commit-hash-input-placeholder-correctionsLuke Bennett2016-10-101-1/+1
| |/ / / | | | | | | | | | | | | Changed 'Commit hash' to 'Git revision'
* | | | Merge branch 'fix-options-caret-mobile-viewport' into 'master' Fatih Acet2016-10-103-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent options dropdown caret on mobile viewports ## What does this MR do? Change the options dropdown caret from left aligned to right aligned (only visible on mobile viewports) ## Are there points in the code the reviewer needs to double check? Check if there are any other dropdowns that have left aligned carets ## Why was this MR needed? Resolve UI inconsistency as some dropdown carets were already right aligned ## Screenshots (if relevant) Before: ![Simulator_Screen_Shot_Sep_15__2016__11.54.55_AM](/uploads/767d9344db4973af5a5368d5149144cc/Simulator_Screen_Shot_Sep_15__2016__11.54.55_AM.png) After: ![Simulator_Screen_Shot_Sep_15__2016__11.54.09_AM](/uploads/882614cb9c5f85bf44e118cd7c74fcef/Simulator_Screen_Shot_Sep_15__2016__11.54.09_AM.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 #22086 See merge request !6372
| * | | | Fix inconsistent options dropdown caret on mobile viewportsClement Ho2016-10-083-2/+3
| | | | |
* | | | | Merge branch 'mr-file-path-copy-btn' into 'master' Fatih Acet2016-10-103-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added copy file path button to diffs ## What does this MR do? Adds a copy file path button in the header of diff files. ## Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_09.59.48](/uploads/1aedd5033bb3c1893023bb8c8d99a708/Screen_Shot_2016-10-10_at_09.59.48.png) ## What are the relevant issue numbers? Closes #23108 See merge request !6769
| * | | | | Added copy file path button to diffsmr-file-path-copy-btnPhil Hughes2016-10-103-2/+4
| | |/ / / | |/| | | | | | | | | | | | | Closes #23108
* | | | | Merge branch 'remove-redundant-mixins' into 'master' Annabel Dunstone Gray2016-10-1022-50/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant mixins ## What does this MR do? Removes the following redundant mixins ``` @mixin box-shadow($shadow) { box-shadow: $shadow; } @mixin border-radius($radius) { border-radius: $radius; } ``` ## Are there points in the code the reviewer needs to double check? Just need to make sure the refactor didn't break anything. Last time I did something like this, we faced an edge case where values `.5` would pass correctly in mixins but not when passed directly to the property. ## Why was this MR needed? * Reduces redundant code which leads to happier developers :smile: ## Screenshots (if relevant) None ## 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 #22012 See merge request !6287
| * | | | Remove redundant mixinsClement Ho2016-10-0822-50/+40
| | |/ / | |/| |
* | | | Merge branch 'doc/link-coverage-badge-to-coverage-report' into 'master' Achilleas Pipinellis2016-10-101-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to test coverage report to README ## What does this MR do? Since we have GitLab Pages with test coverage report, it makes sense to link coverage badge there, instead of linking to commits page. See merge request !6772
| * | | | Add link to test coverage report to READMEdoc/link-coverage-badge-to-coverage-reportGrzegorz Bizon2016-10-101-2/+2
| | |/ / | |/| |
* | | | Merge branch 'fix-misnamed-constant' into 'master' Robert Speicher2016-10-103-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename HTMLEntityFilter to HtmlEntityFilter to fix autoloading See merge request !6776
| * | | | HTMLEntityFilter -> HtmlEntityFilterNick Thomas2016-10-103-3/+3
| | | | |
* | | | | Merge branch 'use-let-in-tests' into 'master' Stan Hu2016-10-101-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use user from let instead recreate in before ## What does this MR do? It`s minor fix in tests. We can use factory from let instead recreate user before each test. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? ## Screenshots (if relevant) No ## 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 - [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) - [ ] [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 !6762
| * | | | | Use user from let instead recreate in beforeSemyon Pupkov2016-10-091-1/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'jmcgeheeiv/gitlab-ce-patch-1' into 'master' Achilleas Pipinellis2016-10-101-23/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve backup doc readability From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3761 See merge request !6781
| * | | | | Add registry to skipped data in backup raketask docsAchilleas Pipinellis2016-10-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Added "CI secret variables" per @axil.John McGehee2016-09-291-3/+3
| | | | | |
| * | | | | Rebase and resolve conflicts in backup doc for !3761john McGehee2016-09-281-23/+34
| | | | | |
* | | | | | Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the extra chmod There is confusion about what passing `0600` to File.open does. ``` $ touch /tmp/foobar $ ls -l /tmp/foobar -rw-r--r-- 1 jacobvosmaer wheel 0 Sep 26 14:20 /tmp/foobar $ ruby -e 'File.open("/tmp/foobar", "w", 0600)' $ ls -l /tmp/foobar -rw-r--r-- 1 jacobvosmaer wheel 0 Sep 26 14:20 /tmp/foobar $ $ $ rm /tmp/foobar $ ruby -e 'File.open("/tmp/foobar", "w", 0600)' $ ls -l /tmp/foobar -rw------- 1 jacobvosmaer wheel 0 Sep 26 14:21 /tmp/foobar ``` See merge request !6523
| * | | | | | Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
| | | | | | |
* | | | | | | Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into ↵2529-error-502-when-creating-mrAchilleas Pipinellis2016-10-102-11/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changes to make Git basics more intuitive From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6420 See merge request !6777
| * | | | | | | Updating changes based on feedback from @connorsheaJerdog2016-10-101-5/+5
| | | | | | | |
| * | | | | | | Changes to make Git basics more intuitiveJerdog2016-10-102-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - updated verbiage where appropriate - changed "git config" commands to include quotes for variables to be more in line with standard practive and to avoid issues with spaces - updated CHANGELOG as part of commit
* | | | | | | | Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'Rémy Coutable2016-10-104-9/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Ci::ApplicationController. See gitlab-org/gitlab-ce!6757.
| * | | | | | | Remove Ci::ApplicationControllerTakuya Noguchi2016-10-104-9/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'gtrafimenkov/gitlab-ce-clarify-runners-delete-token' into ↵Achilleas Pipinellis2016-10-102-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Clarify which token should be used to delete a Runner See merge request !6775
| * | | | | | Clarify which token should be used to delete a runnerGennady Trafimenkov2016-10-102-2/+5
|/ / / / / /
* | | | | | Merge branch 'fix/async-pipeline-processing-stale-data' into 'master' Kamil Trzciński2016-10-103-16/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ci pipeline processing with async jobs ## What does this MR do? This MR fixes CI pipeline processing with asynchronous jobs called from `around_transition` provided by state machine. For details see https://github.com/pluginaweek/state_machine/issues/191 and commit f68acba. ## Why was this MR needed? Recently merged https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6650 introduced problem with asynchronous job being deployed when `around_transition` still held transaction, which caused race condition that prevented pipeline status to change in a proper way. ## What are the relevant issue numbers? Closes #23111 See merge request !6736