summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implement review feedbackqa-github-oauth-login-testSanad Liaquat2019-01-316-6/+14
|
* Add e2e QA test for logging in using Github OAuthSanad Liaquat2019-01-3182-555/+666
|
* Merge branch 'winh-ee-switch' into 'master'Kushal Pandya2019-01-319-20/+8
|\ | | | | | | | | Use ee_else_ce alias to resolve merge request widget files See merge request gitlab-org/gitlab-ce!24374
| * Delete ee_switch files from merge request widgetWinnie Hellmann2019-01-305-15/+0
| | | | | | | | (cherry picked from commit 9c64af3c2821d4f63e4a48903f4d3099bb85cebd)
| * Use ee_else_ce alias in merge request widgetWinnie Hellmann2019-01-303-5/+5
| | | | | | | | (cherry picked from commit 5c35cdc929abf5251512ba6ddf7078e570232709)
| * Add ee_else_ce alias to Webpack configWinnie Hellmann2019-01-301-0/+3
| | | | | | | | | | | | | | (cherry picked from commit da3cd00f5a31f762eb67c2824233ad2b275b2ba8) Conflicts: config/webpack.config.js
* | Merge branch 'docs-fix-space-unicode' into 'master'Evan Read2019-01-313-14/+14
|\ \ | | | | | | | | | | | | Docs: Change non-standard NBSP space to regular SP space See merge request gitlab-org/gitlab-ce!24794
| * | Change non-standard NBSP space to regular SP spaceMarcel Amirault2019-01-303-14/+14
| | |
* | | Merge branch 'docs/update-terminal-docs' into 'master'Evan Read2019-01-311-5/+6
|\ \ \ | | | | | | | | | | | | | | | | Update web terminal note for shared runners See merge request gitlab-org/gitlab-ce!24754
| * | | Update web terminal note for shared runnersSteve Azzopardi2019-01-301-5/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | The current documentation suggests that a user can not use his own runner for a specific group or project. At first I thought this was the case but it is not true, since we do allow websocket connections on GitLab.com, this was discovered as part of the investigation on https://gitlab.com/gitlab-org/gitlab-ce/issues/52611.
* | | Merge branch 'highlight-environment-args' into 'master'Evan Read2019-01-311-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Highlight when CI_ENVIRONMENT_* environment args are present See merge request gitlab-org/gitlab-ce!24484
| * | | Highlight when CI_ENVIRONMENT_* environment args are presentOliver Bristow2019-01-301-3/+3
| | | |
* | | | Merge branch '56764-poor-ui-on-milestone-validation-error-page' into 'master'Clement Ho2019-01-314-11/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CSS grid on a new Project/Group Milestone Closes #56764 See merge request gitlab-org/gitlab-ce!24614
| * | | | Fix CSS grid on a new Project/Group MilestoneTakuya Noguchi2019-01-304-11/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Revert "Merge branch '56398-fix-cluster-installation-loading-state' into ↵Robert Speicher2019-01-306-76/+125
| | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !24485
* | | | | Merge branch 'patch-38' into 'master'Tim Zallmann2019-01-302-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix display comment avatars issue in IE 11 Closes #56931 See merge request gitlab-org/gitlab-ce!24777
| * | | | | fix display comment avatars issue in IE 11Gokhan Apaydin2019-01-302-1/+7
|/ / / / /
* | | | | Merge branch 'mj/security-release-process' into 'master'Robert Speicher2019-01-304-22/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create security release MR template Closes gitlab-org/release/framework#168, gitlab-org/release/framework#166, and gitlab-org/release/framework#167 See merge request gitlab-org/gitlab-ce!24725
| * | | | | Address docs review feedbackMarin Jankovski2019-01-291-3/+3
| | | | | |
| * | | | | Create security release MR templateMarin Jankovski2019-01-284-22/+47
| | | | | | | | | | | | | | | | | | | | | | | | Improve existing issue templates for security releases
* | | | | | Merge branch 'feature/gb/pass-bridge-variables-to-downstream' into 'master'Douwe Maan2019-01-304-51/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass build variables downstream / CE port See merge request gitlab-org/gitlab-ce!24762
| * | | | | | Simplify relation between a build and metadataGrzegorz Bizon2019-01-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes erroneously defined polymorphic association, because specifying `belongs_to` relationship with a class that already supports polymorphic associations works out-of-the-box.
| * | | | | | Extract processable metadata to a separate concernGrzegorz Bizon2019-01-293-51/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We extracted implementation of build/bridge metadata attributes to a separate concern, because in EE `Ci::Bridge` also has metadata attributes, and we want to build abstraction for storing values in build metadata table.
| * | | | | | Add bridge variables trait to the factoryGrzegorz Bizon2019-01-291-0/+4
| | | | | | |
* | | | | | | Merge branch '56398-fix-cluster-installation-loading-state' into 'master'Fatih Acet2019-01-306-125/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cluster installation processing spinner Closes #56398 See merge request gitlab-org/gitlab-ce!24485
| * | | | | | | Fix cluster installation processing spinnerJacques Erasmus2019-01-306-125/+76
|/ / / / / / /
* | | | | | | Merge branch 'support-CNG-mirror-2-ce' into 'master'Lin Jen-Shin2019-01-301-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass $CI_COMMIT_TAG as GITLAB_TAG to the CNG triggered pipelines See merge request gitlab-org/gitlab-ce!24639
| * | | | | | | Pass $CI_COMMIT_TAG as GITLAB_TAG to the CNG triggered pipelinesRémy Coutable2019-01-301-0/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'cluster_status_for_ugprading' into 'master'Grzegorz Bizon2019-01-304-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose app version to frontend See merge request gitlab-org/gitlab-ce!24791
| * | | | | | | Expose app version to frontendThong Kuah2019-01-314-1/+12
| | | | | | | |
* | | | | | | | Merge branch '8688-recursive-pipelines' into 'master'Sean McGivern2019-01-301-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Prefer to use overrides on PipelinesController See merge request gitlab-org/gitlab-ce!24793
| * | | | | | | Prefer to use overrides on PipelinesControllerKamil Trzciński2019-01-301-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'fix/bamboo_api_polymorphism' into 'master'Grzegorz Bizon2019-01-303-14/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support bamboo api polymorphism See merge request gitlab-org/gitlab-ce!24680
| * | | | | | | | Support polymorphism of Bamboo REST API resultsAlex Lossent2019-01-303-14/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may return single result or an array of results
* | | | | | | | | Merge branch ↵Douglas Barbosa Alexandre2019-01-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6102-extract-ee-specific-files-lines-for-some-project-ci-views' into 'master' CE: Resolve "Extract EE specific files/lines for some project CI views" See merge request gitlab-org/gitlab-ce!24774
| * | | | | | | | | Port changes from EE. Remove unused classLin Jen-Shin2019-01-301-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'an-opentracing-render-tracing' into 'master'Douwe Maan2019-01-307-12/+275
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OpenTracing instrumentation for Action View Render events See merge request gitlab-org/gitlab-ce!24728
| * | | | | | | | | | Add OpenTracing instrumentation for Action View Render eventsAndrew Newdigate2019-01-307-12/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds three new instrumentations, driven through rails notifications: render_template.action_view, render_collection.action_view and render_partial.action_view. These can help developers understand why renders are taking a long time which may in turn help them to improve their performance.
* | | | | | | | | | | Merge branch 'docs-releases-permissions' into 'master'Marcia Ramos2019-01-301-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Releases permissions Closes #56471 See merge request gitlab-org/gitlab-ce!24766
| * | | | | | | | | | Docs: Releases permissionsMarcia Ramos2019-01-301-0/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-issue-53419-fix' into 'master'Rémy Coutable2019-01-306-7/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bitbucket Server import not allowing personal projects Closes #53419 See merge request gitlab-org/gitlab-ce!23601
| * | | | | | | | | | Fix Bitbucket Server import not allowing personal projectsStan Hu2019-01-286-7/+37
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bitbucket Server places personal projects in a namespace called `~username`. This change allows those projects and also strips them from the GitLab namespace. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53419
* | | | | | | | | | Merge branch 'docs/add-bundler-version' into 'master'Achilleas Pipinellis2019-01-301-54/+76
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make supported bundler version clearer and polish topic See merge request gitlab-org/gitlab-ce!24590
| * | | | | | | | | | Make supported bundler version clearer and polish topicEvan Read2019-01-301-54/+76
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'coding-style-not-visual-style' into 'master'Sean McGivern2019-01-301-0/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename issue template from "Add style" to "Coding style" See merge request gitlab-org/gitlab-ce!24788
| * | | | | | | | | | Rename issue template from "Add style" to "Coding style"Lin Jen-Shin2019-01-301-0/+0
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because there were a few people thought that's for UI styling...
* | | | | | | | | | Merge branch 'docs/restore-variable-naming' into 'master'Achilleas Pipinellis2019-01-3018-56/+61
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation now matches UI copy Closes #56783 See merge request gitlab-org/gitlab-ce!24659
| * | | | | | | | | | Documentation now matches UI copyEvan Read2019-01-3018-56/+61
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'anan-add-MethodCallWithoutArgsParentheses-cop' into 'master'Lin Jen-Shin2019-01-3026-47/+42
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable MethodCallWithoutArgsParentheses Cop Closes #56795 See merge request gitlab-org/gitlab-ce!24631
| * | | | | | | | | | Re-enable MethodCallWithoutArgsParentheses CopAndrew Newdigate2019-01-2926-47/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enables and autocorrects all instances of the Style/MethodCallWithoutArgsParentheses rule