summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-2033-105/+283
|\
| * Merge branch 'remove-csp-sentry-reporting' into 'master' Stan Hu2016-07-201-12/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the Sentry spam from CSP violations by disabling it. ## What does this MR do? Leaves CSP enabled, but without a reporting endpoint for now. This was causing a huge amount of useless errors in our Sentry instance. cc: @stanhu See merge request !5354
| | * Fix the Sentry spam from CSP violations by disabling it.Connor Shea2016-07-191-12/+2
| |/
| * Merge branch 'wiki-gfm-autocomplete' into 'master' Jacob Schatz2016-07-202-5/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed GFM autocomplete not loading on wiki pages ## What does this MR do? Allows the GFM autocomplete to work on wiki pages. ## What are the relevant issue numbers? Closes #19580 See merge request !5132
| | * Chnaged noteable class checkwiki-gfm-autocompletePhil Hughes2016-07-141-1/+1
| | |
| | * Fixed GFM autocomplete not loading on wiki pagesPhil Hughes2016-07-072-5/+6
| | | | | | | | | | | | Closes #19580
| * | Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' Kamil Trzciński2016-07-194-29/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build duration when build is not finished yet ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Fixes #19937. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think) - Tests - [x] Added for this feature/bug - [ ] 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) See merge request !5323
| | * | Fix build duration when build is not finished yet19937-fix-wrong-build-elapsed-timeRémy Coutable2016-07-184-29/+26
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'fix/limit-rev-list-count-to-one' into 'master' Douwe Maan2016-07-192-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit git rev-list output count to one in forced push check ## What does this MR do? It adds `--max-count=1` to the git command used to check for forced push, this way we can have a brief yet indicative output, saving some time used to split the string returned. Credits go to @pacoguzman for pointing me to the command option. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? It could allow for faster check of forced pushes. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14280#note_13177575 ## Screenshots (if relevant) N/A ## 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~~ - [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) - [ ] ~~[Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~ See merge request !5352
| | * | | Limit git rev-list output count to one in forced push checkAhmad Sherif2016-07-192-2/+3
| | | | |
| * | | | Merge branch 'rs-issue-19878' into 'master' Douwe Maan2016-07-192-8/+17
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure Owners are included in the scope for authorized_projects Prior, when providing a `min_access_level` parameter to this method, we called `Gitlab::Access.values` instead of `all_values`, mistakenly omitting the `OWNER` level. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878 See merge request !5353
| | * | | Ensure Owners are included in the scope for authorized_projectsRobert Speicher2016-07-192-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, when providing a `min_access_level` parameter to this method, we called `Gitlab::Access.values` instead of `all_values`, mistakenly omitting the `OWNER` level. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878
| * | | | Merge branch '19847-running-icon' into 'master' Jacob Schatz2016-07-1914-10/+147
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new CI status icons ## What does this MR do? Adds new CI status icons for every state ## What are the relevant issue numbers? Closes #19847 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_6.58.37_AM](/uploads/ec391b59825f5a4a228d7c77e7485b1e/Screen_Shot_2016-07-19_at_6.58.37_AM.png) See merge request !5280
| | * | | | Fix alignment of icons on project page19847-running-iconAnnabel Dunstone2016-07-191-0/+5
| | | | | |
| | * | | | Fix ci_status_helper_spec to look for new SVGsAnnabel Dunstone2016-07-191-2/+8
| | | | | |
| | * | | | Vertically align status icon within tableAnnabel Dunstone2016-07-191-0/+1
| | | | | |
| | * | | | Add new icons for every CI statusAnnabel Dunstone2016-07-198-28/+42
| | | | | |
| | * | | | Add global style for running iconAnnabel Dunstone2016-07-195-27/+25
| | | | | |
| | * | | | Align running icon in merge requestAnnabel Dunstone2016-07-191-0/+10
| | | | | |
| | * | | | Add new running icon; add a bunch of styles to get svg to match existing fa ↵Annabel Dunstone2016-07-1911-3/+106
| | | | | | | | | | | | | | | | | | | | | | | | icons
| * | | | | Merge branch 'feature/rouge-2.0.4' into 'master' Stan Hu2016-07-191-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrade rouge to 2.0.5 ## What does this MR do? Upgrades Rouge to 2.0.5 ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? New lexers and bugfixes from upstream. ## What are the relevant issue numbers? ## 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 [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 !5351
| | * | | | | use 2.0.5, actually (2.0.4 was a bad release)feature/rouge-2.0.4http://jneen.net/2016-07-191-1/+1
| | | | | | |
| | * | | | | upgrade rouge to 2.0.4http://jneen.net/2016-07-191-1/+1
| | | | | | |
| * | | | | | Merge branch 'clipboard-button' into 'master' Jacob Schatz2016-07-192-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove white background on clipboard button; position icon ## What does this MR do? Removes white background from clipboard button ## What are the relevant issue numbers? Closes #19098 ## Screenshots (if relevant) ![Screen_Shot_2016-07-18_at_3.12.24_PM](/uploads/4a6a540e1a074e6cf89fb99be1b49f2d/Screen_Shot_2016-07-18_at_3.12.24_PM.png) ![Screen_Shot_2016-07-18_at_8.50.55_PM](/uploads/8c594b6f9a74095b194fe1f634eaf226/Screen_Shot_2016-07-18_at_8.50.55_PM.png) See merge request !5335
| | * | | | | | Remove white background on clipboard button; position iconclipboard-buttonAnnabel Dunstone2016-07-182-1/+6
| | | | | | | |
| * | | | | | | Merge branch 'tag-page-updates' into 'master' Jacob Schatz2016-07-192-32/+42
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling of tag page ## What does this MR do? Fixes tag page UI ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-18_at_3.09.28_PM](/uploads/575776fe7917321307baf2b8c2b34d75/Screen_Shot_2016-07-18_at_3.09.28_PM.png) After: ![Screen_Shot_2016-07-18_at_3.09.08_PM](/uploads/44f905318c01eb094989cb74bcd4c3c1/Screen_Shot_2016-07-18_at_3.09.08_PM.png) See merge request !5334
| | * | | | | | | Fix styling of tag pagetag-page-updatesAnnabel Dunstone2016-07-182-32/+42
| | |/ / / / / /
| * | | | | | | Merge branch 'fork-icon' into 'master' Jacob Schatz2016-07-195-4/+34
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New fork icon! ## What does this MR do? We are using the old fork icon for branching only, so this implements our new custom fork icon ## Screenshots (if relevant) ![Screen_Shot_2016-07-15_at_9.22.33_AM](/uploads/05abaffff314e41f582189327bcca6b2/Screen_Shot_2016-07-15_at_9.22.33_AM.png) ![Screen_Shot_2016-07-15_at_9.29.14_AM](/uploads/a08c622c92da00945406bbd4b3497749/Screen_Shot_2016-07-15_at_9.29.14_AM.png) cc @hazelyang See merge request !5276
| | * | | | | | Add svg icon color to btn-color mixinfork-iconAnnabel Dunstone2016-07-153-10/+19
| | | | | | | |
| | * | | | | | Add new fork svg iconAnnabel Dunstone2016-07-153-2/+23
| | | | | | | |
* | | | | | | | Use switch statements instead of if/else chains.Connor Shea2016-07-192-8/+10
| | | | | | | |
* | | | | | | | Address feedback.Connor Shea2016-07-193-11/+21
| | | | | | | |
* | | | | | | | Add with_warnings? method to Pipelines and add tests.Connor Shea2016-07-194-0/+35
| | | | | | | |
* | | | | | | | Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-195-5/+23
|/ / / / / / /
* | | | | | | Merge branch 'fix-help-paths' into 'master' Dmitriy Zaporozhets2016-07-194-11/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix help page paths to make sure shortcuts and the UI help page work. Add a test to make sure the help page UI path doesn't break in the future. Fixes #19972 and #19889. cc: @dzaporozhets @rspeicher @lbennett See merge request !5350
| * | | | | | Fix help page paths to make sure shortcuts and the UI help page work.fix-help-pathsConnor Shea2016-07-194-11/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test to make sure the help page UI path doesn't break in the future. Fix #19972 and #19889.
* | | | | | Merge branch 'rename-repo-files' into 'master' Douwe Maan2016-07-198-3/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the form for renaming the new filename on the file edit page ## What does this MR do? Adds the possibility to edit a filename when editing the content of a file on Gitlab this MR was made to solve #5850 ![Screen_Shot_2016-07-01_at_16.45.53](/uploads/eeed05800e3dc11f1e3840e0e4fa06b5/Screen_Shot_2016-07-01_at_16.45.53.png) See merge request !5049
| * | | | | | fixes an issue cause by a bad mergetiagonbotelho2016-07-191-1/+2
| | | | | | |
| * | | | | | fixes commit_file test on repository_spectiagonbotelho2016-07-191-5/+5
| | | | | | |
| * | | | | | Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-1992-7488/+12408
| |\ \ \ \ \ \
| * | | | | | | fixes rubocop issues and implements create_commit testtiagonbotelho2016-07-182-3/+18
| | | | | | | |
| * | | | | | | Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-18272-2759/+4034
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | adds test for update_file methodtiagonbotelho2016-07-181-0/+14
| | | | | | | |
| * | | | | | | bumps gitlab_git to 10.3.0tiagonbotelho2016-07-181-1/+2
| | | | | | | |
| * | | | | | | renames :file_name to :file_pathtiagonbotelho2016-07-132-4/+4
| | | | | | | |
| * | | | | | | fixes frontend bugtiagonbotelho2016-07-121-1/+1
| | | | | | | |
| * | | | | | | changes " usage to 'tiagonbotelho2016-07-121-1/+1
| | | | | | | |
| * | | | | | | fix gemfile.locktiagonbotelho2016-07-121-77/+77
| | | | | | | |
| * | | | | | | restores gemfile.locktiagonbotelho2016-07-121-96/+96
| | | | | | | |
| * | | | | | | Merge branch 'rename-repo-files' of gitlab.com:tiagonbotelho/gitlab-ce into ↵tiagonbotelho2016-07-121-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | rename-repo-files