summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace `=== true` with `parseBoolean()`winh-parse-booleanWinnie Hellmann2018-11-2115-18/+36
|
* Replace convertPermissionToBoolean with parseBooleanWinnie Hellmann2018-11-2114-38/+35
|
* Add parseBoolean helper functionWinnie Hellmann2018-11-212-1/+35
|
* Merge branch 'patch-32' into 'master'Stan Hu2018-11-211-1/+1
|\ | | | | | | | | Documentation: Fix typo in Merge request description See merge request gitlab-org/gitlab-ce!23266
| * Fix typo in Merge request descriptionYogesh Mangaj2018-11-211-1/+1
| |
* | Merge branch 'dd-ssh-key-smoke' into 'master'Mark Lapierre2018-11-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Make existing SSH create / remove test into a Smoke test Closes #52699 See merge request gitlab-org/gitlab-ce!23252
| * | Make existing SSH create / remove test into a Smoke testdd-ssh-key-smokeddavison2018-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | This particular test is a candidate for a smoke test. This commit will close https://gitlab.com/gitlab-org/gitlab-ce/issues/52699 Signed-off-by: ddavison <ddavison@gitlab.com>
* | | Merge branch 'optimise-job-request' into 'master'Grzegorz Bizon2018-11-212-1/+7
|\ \ \ | | | | | | | | | | | | | | | | Use cached size when passing artifacts to Runner See merge request gitlab-org/gitlab-ce!23228
| * | | Use cached size when passing artifacts to Runneroptimise-job-requestKamil Trzciński2018-11-202-1/+7
| | | |
* | | | Merge branch 'patch-32' into 'master'Stan Hu2018-11-211-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Precisions about the times specified in gitlab.rb for Rack Attack See merge request gitlab-org/gitlab-ce!23246
| * | | | Precisions about the times specified in gitlab.rb for Rack AttackIllan RUL-DA CUNHA2018-11-201-6/+6
| | | | |
* | | | | Merge branch '54282-tooltip-stuck' into 'master'Phil Hughes2018-11-212-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes stuck tooltip on stop env button Closes #53571 and #54282 See merge request gitlab-org/gitlab-ce!23244
| * \ \ \ \ Merge branch 'master' into 54282-tooltip-stuck54282-tooltip-stuckFilipa Lacerda2018-11-21434-6186/+2417
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Adds a PHILOSOPHY.md Externalize strings from `/app/views/abuse_reports` Fix Issuable container element selector for shortcuts handling Enable Rubocop on lib/gitlab Add user docs for Pages access control Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571 Align issue status label and confidential icon Externalize strings from `/app/views/repository_check_mailer` Remove instances of `@extend .monospace` Resolve "The reply shortcut can add any text of the page to the "comment" text area" Upgrade escape_utils to 1.2.1 Add dedicated runner tags to assets job Upgrade gitlab eslint config to latest Fix broken karma specs Disable conflicting eslint rules Prettify all the things Upgrade prettier to 1.15.2 Added a test for open merge request files Update CHANGELOG.md for 11.4.7 Open first 10 merge request files in IDE ...
| * | | | | | Fixes stuck tooltip on stop env buttonFilipa Lacerda2018-11-202-4/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Used the glTooltipdirective to fix the tooltip on the stop environment button in the mr widget getting stuck when the element is not in hover state
* | | | | | Merge branch 'sh-workaround-ruby-2-5-3-bug' into 'master'Kamil Trzciński2018-11-211-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around Ruby 2.5.3 crash when a CI job is selected See merge request gitlab-org/gitlab-ce!23256
| * | | | | | Work around Ruby 2.5.3 crash when a CI job is selectedsh-workaround-ruby-2-5-3-bugStan Hu2018-11-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.5.3 in combination with Rails 5 appears to crash in development when a CI job is selected for a runner. For some reason, the return inside the block seems to seg fault. Let's get rid of this since this isn't a good coding practice in any case. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/54281 Also see https://bugs.ruby-lang.org/issues/15325.
* | | | | | | Merge branch 'patch-32' into 'master'Achilleas Pipinellis2018-11-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: specify regexp language used for `only`/`except` mechanism in `.gitlab-ci.yaml` See merge request gitlab-org/gitlab-ce!23235
| * | | | | | | Specify regexp language used for `only`/`except` mechanism in `.gitlab-ci.yaml`Elouan Keryell-Even2018-11-201-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-11-2137-8827/+102975
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of EE-translations to CE See merge request gitlab-org/gitlab-ce!23247
| * | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2018-11-2037-8827/+102975
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!8507
* | | | | | | | Merge branch '53578-fe-deployment-status' into 'master'Phil Hughes2018-11-214-0/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds missing status in deployment widget See merge request gitlab-org/gitlab-ce!23239
| * | | | | | | | Adds missing status in deployment widget53578-fe-deployment-statusFilipa Lacerda2018-11-204-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders created and canceled status in MR widget
* | | | | | | | | Merge branch 'patch-28' into 'master'Sean McGivern2018-11-211-8/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented Response of /wikis/home should be a wiki object and not an array See merge request gitlab-org/gitlab-ce!23263
| * | | | | | | | | Response of /wiki/home should be a wiki object and not an arrayakkee2018-11-211-8/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch '52453-show-subgroups-in-group-create-issue' into 'master'Sean McGivern2018-11-219-11/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Access project from descendent groups when selecting project to create new issue" Closes #47096 and #52453 See merge request gitlab-org/gitlab-ce!22612
| * | | | | | | | | | Prettify JSHeinrich Lee Yu2018-11-192-9/+15
| | | | | | | | | | |
| * | | | | | | | | | Add documentationHeinrich Lee Yu2018-11-191-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Add :nested_groups metadata to tests using subgroupsHeinrich Lee Yu2018-11-191-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Change param name for consistencyHeinrich Lee Yu2018-11-197-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Add changelog entryHeinrich Lee Yu2018-11-191-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Update project selection dropdown API paramsHeinrich Lee Yu2018-11-195-4/+12
| | | | | | | | | | |
| * | | | | | | | | | Add group projects API options for including shared and subgroupsHeinrich Lee Yu2018-11-192-1/+39
| | | | | | | | | | |
* | | | | | | | | | | Update VERSION to 11.6.0-prev11.6.0.preGitLab Release Tools Bot2018-11-211-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 11.5.0GitLab Release Tools Bot2018-11-21238-1187/+262
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'frozen-string-lib-rubocop' into 'master'Rémy Coutable2018-11-212-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop on lib/gitlab See merge request gitlab-org/gitlab-ce!23259
| * | | | | | | | | | Enable Rubocop on lib/gitlabgfyoung2018-11-202-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should wrap up frozen string enablement for gitlab-ce. xref gitlab-org/gitlab-ce#47424.
* | | | | | | | | | | Merge branch 'gt-externalize-app-views-abuse-reports' into 'master'Kushal Pandya2018-11-212-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/abuse_reports` See merge request gitlab-org/gitlab-ce!23203
| * | | | | | | | | | | Externalize strings from `/app/views/abuse_reports`George Tsiolis2018-11-212-4/+7
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSteve Azzopardi2018-11-211-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Update CHANGELOG.md for 11.4.7GitLab Release Tools Bot2018-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch 'rs-asset-compilation-tags' into 'master'Marin Jankovski2018-11-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dedicated runner tags to assets job See merge request gitlab-org/gitlab-ce!23242
| * | | | | | | | | | | Add dedicated runner tags to assets jobrs-asset-compilation-tagsRobert Speicher2018-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ordinarily it would get the `gitlab-org` tag from `dedicated-no-docs-pull-cache-job`, but adding the `docker` tag overwrites rather than inherits, so this job has been running on the underpowered hardware of the shared runners rather than our dedicated runners. We're also adding a `high-cpu` tag, which doesn't currently do anything but will be useful for targeting a runner specifically for this job.
* | | | | | | | | | | | Merge branch 'kcj-add-philosophy' into 'master'Sean McGivern2018-11-212-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a PHILOSOPHY.md See merge request gitlab-org/gitlab-ce!23200
| * | | | | | | | | | | Adds a PHILOSOPHY.mdKenny Johnston2018-11-212-0/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-8511-fix-selector-for-issuable-contents' into 'master'Tim Zallmann2018-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Fix Issuable container element selector for shortcuts handling See merge request gitlab-org/gitlab-ce!23260
| * | | | | | | | | | | Fix Issuable container element selector for shortcuts handlingKushal Pandya2018-11-211-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs-specify-labels-in-project-group' into 'master'Victor Wu2018-11-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs specify labels in project and group list pages See merge request gitlab-org/gitlab-ce!22886
| * | | | | | | | | | | Update labels.mddocs-specify-labels-in-project-groupVictor Wu2018-11-071-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md See merge request gitlab-org/gitlab-ce!23192
| * | | | | | | | | | | | Update README.mdBruce Szalwinski2018-11-191-1/+1
| | | | | | | | | | | | |