summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookupImre Farkas2018-11-055-14/+11
| | | | | | find_by_token is overriden by TokenAuthenticatable which can be easily missed or confused with #find_by(:token) defined by ActiveRecord. First step for safer usage is to remove #find_by.
* Merge branch 'mlapierre-master-patch-47853' into 'master'Marin Jankovski2018-10-301-3/+3
|\ | | | | | | | | Fix Review Apps testing guide See merge request gitlab-org/gitlab-ce!22670
| * Fix Review Apps testing guidemlapierre-master-patch-47853Mark Lapierre2018-10-291-3/+3
| | | | | | Changes from docs review
* | Merge branch 'rename-secret-variables-1' into 'master'Grzegorz Bizon2018-10-3025-64/+69
|\ \ | | | | | | | | | | | | | | | | | | Renaming Secret Variables in the codebase Closes #49629 See merge request gitlab-org/gitlab-ce!22414
| * | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-3025-64/+69
|/ /
* | Merge branch 'qa-filter-comments-in-issues' into 'master'Grzegorz Bizon2018-10-303-15/+55
|\ \ | | | | | | | | | | | | | | | | | | Adding tests for filtering activities/comments in issues Closes #51889 See merge request gitlab-org/gitlab-ce!22564
| * | Adding tests for filtering activities/comments in issuesRamya Authappan2018-10-303-15/+55
|/ /
* | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-3023-59/+66
|\ \
| * \ Merge branch 'bw-fix-spec-in-merge' into 'master'Stan Hu2018-10-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix problem with spec that showed up in EE merge See merge request gitlab-org/gitlab-ce!22675
| | * | Fix problem with spec that showed up in EE mergeBrett Walker2018-10-291-1/+1
| | | |
| * | | Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' ↵Evan Read2018-10-301-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into 'master' docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ce!22575
| | * | Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ceOlivier Gonzalez2018-10-241-0/+6
| | | |
| * | | Merge branch 'patch-31' into 'master'Evan Read2018-10-301-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Added a note about machine types See merge request gitlab-org/gitlab-ce!22572
| | * | | Added a note about machine typesMark Veenstra2018-10-301-0/+3
| |/ / /
| * | | Merge branch 'update-gitlab-ui' into 'master'Mike Greiling2018-10-2916-51/+51
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update gitlab-ui to 1.9.0 See merge request gitlab-org/gitlab-ce!22632
| | * | | Update gitlab-ui to 1.9.0Clement Ho2018-10-2916-51/+51
| |/ / /
| * | | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-294-7/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mousetrap-rails gem Closes #53270 See merge request gitlab-org/gitlab-ce!22647
| | * | | Remove mousetrap-rails gemTakuya Noguchi2018-10-284-7/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-29406-3204/+6889
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2925-47/+55
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
| | * | | | Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-urlblackst0ne2018-10-271-1/+0
| | | | | |
| | * | | | Fix specsblackst0ne2018-10-268-16/+17
| | | | | |
| | * | | | Update other linksblackst0ne2018-10-2614-23/+25
| | | | | |
| | * | | | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-236-9/+15
| | | | | |
| * | | | | Merge branch 'ml-qa-push-private-token' into 'master'Dan Davison2018-10-292-1/+33
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Add e2e test to push using a private token See merge request gitlab-org/gitlab-ce!22628
| | * | | | Add e2e test to push using a private tokenml-qa-push-private-tokenMark Lapierre2018-10-292-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | Tests pushing over HTTP(S) using a personal access token
| * | | | | Merge branch '53273-update-moment-to-2-22-2' into 'master'Mike Greiling2018-10-292-6/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update moment to 2.22.2 Closes #53273 See merge request gitlab-org/gitlab-ce!22648
| | * | | | | Update moment to 2.22.2Takuya Noguchi2018-10-282-6/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | | | Merge branch 'pages-1-3-0' into 'master'Robert Speicher2018-10-291-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages to v1.3.0 See merge request gitlab-org/gitlab-ce!22666
| | * | | | | Update GitLab Pages to v1.3.0Nick Thomas2018-10-291-1/+1
| | | | | | |
| * | | | | | Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-296-6/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace deprecated uniq on a Relation with distinct See merge request gitlab-org/gitlab-ce!22625
| | * | | | | | Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-266-6/+11
| | | | | | | |
| * | | | | | | Merge branch '5979_rename_sast_container_gitlab_features-ce' into 'master'Kamil Trzciński2018-10-291-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename 'sast_container' licensed feature See merge request gitlab-org/gitlab-ce!22662
| | * | | | | | | Rename 'sast_container' licensed feature5979_rename_sast_container_gitlab_features-ceKamil Trzciński2018-10-291-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'sh-bump-whitequark-parser' into 'master'Robert Speicher2018-10-291-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22652
| | * | | | | | | | Upgrade whitequark/parser to 2.5.3.0sh-bump-whitequark-parserStan Hu2018-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This squelches the following warning: warning: parser/current is loading parser/ruby24, which recognizes warning: 2.4.4-compliant syntax, but you are running 2.4.5. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.
| * | | | | | | | | Merge branch 'winh-delete-job-spec' into 'master'Filipa Lacerda2018-10-291-265/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete job_spec.js See merge request gitlab-org/gitlab-ce!22664
| | * | | | | | | | Delete job_spec.jsWinnie Hellmann2018-10-291-265/+0
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'gt-truncate-milestone-title-on-collapsed-sidebar' into 'master'Clement Ho2018-10-292-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Truncate milestone title on collapsed sidebar See merge request gitlab-org/gitlab-ce!22624
| | * | | | | | | Truncate milestone title on collapsed sidebarGeorge Tsiolis2018-10-262-1/+6
| | | | | | | | |
| * | | | | | | | Merge branch '52122-fix-broken-whitespace-button' into 'master'Phil Hughes2018-10-294-7/+178
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken "Show whitespace changes" button on MR "Changes" tab Closes #52122 See merge request gitlab-org/gitlab-ce!22539
| | * | | | | | | | Fix broken "Show whitespace changes" button on MR "Changes" tabJacques Erasmus2018-10-294-7/+178
| |/ / / / / / / /
| * | | | | | | | Merge branch '45669-table-in-jobs-on-pipeline' into 'master'Nick Thomas2018-10-296-52/+64
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all tables from Pipeline page when there is no job for the Pipeline Closes #45669 See merge request gitlab-org/gitlab-ce!18540
| | * | | | | | | Remove all tables from Pipeline page when there is no job for the PipelineTakuya Noguchi2018-10-296-52/+64
| |/ / / / / / /
| * | | | | | | Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into ↵Nick Thomas2018-10-293-4/+34
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Extract ee specific lines for issues and mr controllers See merge request gitlab-org/gitlab-ce!22569
| | * | | | | | | Extract EE-specific lines from MRs controllerextract-ee-specific-lines-for-issues-and-mr-controllersSean McGivern2018-10-262-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move access checks to their own method so they can be overridden, and port an EE-only method to exist in CE too, with an EE-specific override.
| | * | | | | | | Extract EE-specific lines from issues controllerSean McGivern2018-10-241-3/+16
| | | | | | | | |
| * | | | | | | | Merge branch '53155-structured-logs-params-array' into 'master'Sean McGivern2018-10-293-2/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix open-ended params for api_json.log Closes #53155 See merge request gitlab-org/gitlab-ce!22623
| | * | | | | | | | Fix open-ended params for api_json.logAndrew Newdigate2018-10-293-2/+15
| |/ / / / / / / /
| * | | | | | | | Merge branch 'lyle-master-patch-08152' into 'master'Achilleas Pipinellis2018-10-291-1/+18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds warning against Postgres across NFS See merge request gitlab-org/gitlab-ce!22278
View Lorry Controller Status