summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-038-12/+7
|
* Add an oauth provider path helper.Connor Shea2016-08-035-4/+10
| | | | | | The helper constructs the path for a given oauth provider since Devise 4.0 deprecated passing the provider to the omniauth authentication path. Fixes #18110.
* Merge branch 'job/update-workflow-links' into 'master' Stan Hu2016-08-022-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link the engineering workflow document from process and contributing ## What does this MR do? Add links to process and contributing to the engineering workflow document. ## Are there points in the code the reviewer needs to double check? no. ## Why was this MR needed? The engineering workflow document is very important to Inc developers, but was hard to find. ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? not relevant See merge request !5625
| * link the engineering workflow document from process and contributingjob/update-workflow-linksJob van der Voort2016-08-022-0/+4
| |
* | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-027-10/+60
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branch names ending with .json for graph and network page ## What does this MR do? Allow branch names to end with `.json` for graph and network page. ## Why was this MR needed? Displaying branches ending on `.json` in repository view crashes because links to graph and network page can not be determined. ## What are the relevant issue numbers? fixes #20462, #19585 See merge request !5579
| * | Allow branch names ending with .json for graph and network page (!5579)winniehell2016-08-023-8/+13
| | |
| * | Append .json onto graph request URL (!5136)Phil Hughes2016-08-021-1/+1
| | |
| * | Add failing test for #20462winniehell2016-08-024-2/+47
| | |
* | | Merge branch 'expand-commit-message-view' into 'master' Fatih Acet2016-08-025-7/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand commit message width in repo view ## What does this MR do? Expands the commit message width in repo view to take advantage of the unused white space (under the history href) ## Are there points in the code the reviewer needs to double check? Just need to make sure there aren't any side effects ## Why was this MR needed? To take advantage of the unused space on repo views ## What are the relevant issue numbers? Closes #20225 ## Screenshots Before: ![Screen_Shot_2016-07-27_at_11.10.22_AM](/uploads/1f2c604ac6d4ede2bac67179cfe77b20/Screen_Shot_2016-07-27_at_11.10.22_AM.png) After: ![Screen_Shot_2016-07-27_at_11.08.55_AM](/uploads/34a36c884a06fd6cfd9b6512d1230196/Screen_Shot_2016-07-27_at_11.08.55_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] 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) See merge request !5494
| * | | Expand commit message width in repo viewClement Ho2016-08-025-7/+35
| | | |
* | | | Merge branch 'update-templates-for-8-11' into 'master' Robert Speicher2016-08-0214-4/+140
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add and update vendored templates for 8.11 [ci skip] See merge request !5626
| * | | Add and update templates for 8.11Ruben Davila2016-08-0214-4/+140
| | | |
* | | | Merge branch 'ff-artifacts-date-fix' into 'master' Fatih Acet2016-08-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed artifacts expire date in FF ## What does this MR do? FireFox was trying to parse the date incorrectly so it would just show 'Past due' ## Screenshots (if relevant) ![Screen_Shot_2016-07-21_at_17.16.57](/uploads/938d39c648dc98540cd991cf552276dd/Screen_Shot_2016-07-21_at_17.16.57.png) See merge request !5403
| * | | | Fixed artifacts expire date in FFff-artifacts-date-fixPhil Hughes2016-07-271-1/+1
| | | | |
* | | | | Merge branch '14202-speed-up-diff-note-active' into 'master' Yorick Peterse2016-08-029-5/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Speedup DiffNote#active? on discussions See merge request !5597
| * | | | | Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵Paco Guzman2016-08-029-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touching git repository to return diff_refs when possible - Preloading noteable we share the same noteable instance when more than one discussion refers to the same noteable. - Any other call to that object that is cached in that object will be for any discussion. - In those cases where merge_request_diff has all the sha stored to build a diff_refs get that diff_refs using directly those sha instead accessing to the git repository to first get the commits and later the sha.
* | | | | | Merge branch 'es6-specs-pls' into 'master' Fatih Acet2016-08-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add es6 to teaspoon ## What does this MR do? Adds the `es6` file extensions to teaspoon matchers so it can load those specs. This also removes the current coffee matchers. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We need to accept `.js.es6` specs. ## 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 !5524
| * | | | | | Removed coffee matcherses6-specs-plsLuke Bennett2016-07-291-1/+1
| | | | | | |
| * | | | | | Added es6 regex to teaspoon matchers, still doesnt fix it, problem with ↵Luke Bennett2016-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sprockets-es6
* | | | | | | Merge branch '20101-ci-configuration' into 'master' Fatih Acet2016-08-023-0/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""CI configuration" button when `.gitlab-ci.yml` is present" ## What does this MR do? Adds `CI configuration` button to project overview page ## What are the relevant issue numbers? Closes #20101 ## Screenshots (if relevant) ![Screen_Shot_2016-07-28_at_11.51.32_AM](/uploads/499d942d203d287ae98b7589ef12673c/Screen_Shot_2016-07-28_at_11.51.32_AM.png) See merge request !5558
| * | | | | | Link configuration button to .gitlab-ci.yml20101-ci-configurationAnnabel Dunstone2016-07-282-1/+5
| | | | | | |
| * | | | | | Add CI configuration button on project pageAnnabel Dunstone2016-07-282-0/+5
| | | | | | |
* | | | | | | Merge branch 'update_guides' into 'master' Rémy Coutable2016-08-021-28/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated notes from the update guide ## What does this MR do? updates guides See merge request !5624
| * | | | | | | Remove outdated notes from the update guideValery Sizov2016-08-021-28/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix runner install link ## What does this MR do? Fix link to GitLab CI Runner installation ## Why was this MR needed? Link is broken See merge request !5612
| * | | | | | | fix runner install linkBen Bodenmiller2016-08-021-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'remove-unused-js-libraries' into 'master' Dmitriy Zaporozhets2016-08-022-281/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "md5 and utf_encode js libraries" ## What does this MR do? Remove two unused JavaScript libraries (`md5.js` and `utf8_encode.js`). ## Why was this MR needed? Those libraries were not used anymore: ``` $ find app/ lib/ -name '*.js' -exec grep --perl-regexp --with-filename '(md5|utf8_encode)' {} \; app/assets/javascripts/lib/utils/utf8_encode.js:function utf8_encode (argString) { app/assets/javascripts/lib/utils/utf8_encode.js: // * example 1: utf8_encode('Kevin van Zonneveld'); app/assets/javascripts/lib/utils/md5.js:function md5 (str) { app/assets/javascripts/lib/utils/md5.js: // - depends on: utf8_encode app/assets/javascripts/lib/utils/md5.js: // * example 1: md5('Kevin van Zonneveld'); app/assets/javascripts/lib/utils/md5.js: str = this.utf8_encode(str); ``` See merge request !5613
| * | | | | | Revert "md5 and utf_encode js libraries"winniehell2016-08-022-281/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | This reverts commit 1bba46d66117b4a96d279fd964a45fe673db658c.
* | | | | | Merge branch 'instrument-repository-class' into 'master' Rémy Coutable2016-08-022-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument the Repository class ## What does this MR do? This MR instruments the Repository class. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? This class wasn't instrumented. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5621
| * | | | | | Instrument the Repository classinstrument-repository-classYorick Peterse2016-08-022-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this isn't an ActiveRecord::Base descendant it wasn't instrumented.
* | | | | | | Merge branch '16568-document-wiki-linking-behavior' into 'master' Achilleas Pipinellis2016-08-025-10/+97
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add help document describing intended wiki linking behavior Related to #16568 Closes #18019 - This documents the _intended_ behaviour of linking to wiki pages/files. ## TODO - [x] Respond to @rymai's comments - [x] Use `succeed` - [x] Shouldn't this be <wiki_root>/miscellaneous.md here? - [x] what happens for file links that starts with a `/`? See merge request !4372
| * | | | | | Change Markdown document locationAchilleas Pipinellis2016-08-025-8/+8
| | | | | | |
| * | | | | | Merge wiki-specific Markdown in main Markdown fileAchilleas Pipinellis2016-08-022-89/+80
| | | | | | |
| * | | | | | Refactor wiki Markdown documentationAchilleas Pipinellis2016-08-021-25/+35
| | | | | | |
| * | | | | | Remove the `non-file` qualifier for root links.Timothy Andrew2016-08-021-1/+1
| | | | | | |
| * | | | | | Use `succeed` to add periods to help text.Timothy Andrew2016-08-021-5/+8
| | | | | | |
| * | | | | | Add help document describing wiki linking behavior.Timothy Andrew2016-08-023-0/+83
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-downtime-check-compare-with-branch' into 'master' Yorick Peterse2016-08-021-20/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always compare with FETCH_HEAD in downtime_check See merge request !5619
| * | | | | | Always compare with FETCH_HEAD in downtime_checkYorick Peterse2016-08-021-20/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This ensures this CI step works properly even when doing a shallow clone.
* | | | | | Merge branch 'fix/import-export-note-attachments' into 'master' Rémy Coutable2016-08-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix TODO comment Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20376 After some testing, I've found out this wasn't needed and attachments seemed to work fine for import/export between instances (omnibus & source). See merge request !5617
| * | | | | | fix TODO comment [ci skip]James Lopez2016-08-021-1/+1
| |/ / / / /
* | | | | | Merge branch 'handle-disabled-request-store' into 'master' Yorick Peterse2016-08-022-42/+68
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Only use RequestStore in ProjectTeam#max_member_access_for_users if it is active See merge request !5604
| * | | | | Only use RequestStore in ProjectTeam#max_member_access_for_user if it is activeStan Hu2016-08-012-42/+68
| | | | | |
* | | | | | Merge branch 'relative-markdown-links' into 'master' Rémy Coutable2016-08-023-0/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for relative links starting with ./ or / to RelativeLinkFilter ## What does this MR do? - Allow explicit relative links in Markdown (starting with `./`). - Allow absolute links (relative to the branch's root directory) in Markdown (starting with `/`). ## Why was this MR needed? Those link types were not supported before. ## What are the relevant issue numbers? fixes #19028 See merge request !5586
| * | | | | Add support for relative links starting with ./ or / to RelativeLinkFilter ↵winniehell2016-08-022-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | (!5586)
| * | | | | Add failing tests for #19028winniehell2016-08-021-0/+12
|/ / / / /
* | | | | Merge branch '8-11-guides' into 'master' Robert Speicher2016-08-021-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation guide for 8.11 [ci skip] See merge request !5609
| * | | | | Update installation guide for 8.118-11-guidesRuben Davila2016-08-011-2/+2
|/ / / / /
* | | | | Update CHANGELOG for 8.10.3Robert Speicher2016-08-011-7/+9
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'fix/request-profiler-error-when-unauthenticated' into 'master' Douwe Maan2016-08-012-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch what warden might throw when profiling requests to re-throw it ## What does this MR do? It fixes the error thrown when profiling a request unauthorized. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? It's a bug! :) ## What are the relevant issue numbers? #20488 ## 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5596