summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add documentationapi-group-labelsRobert Schilling2019-02-063-1/+203
|
* Simplify label helper and correct versionRobert Schilling2019-01-314-73/+61
|
* Factor out common label APIRobert Schilling2019-01-316-109/+129
|
* Incorporate feedback from RobertRobert Schilling2019-01-315-120/+83
|
* Correctly search for labels in parent groupsRobert Schilling2019-01-312-6/+6
|
* Don't run subgroup tests for mysqlRobert Schilling2019-01-311-2/+2
|
* Factor out group labels entityRobert Schilling2019-01-315-41/+31
|
* Use proper finder helper to get existing labelsRobert Schilling2019-01-311-11/+13
|
* fix rebasingRobert Schilling2019-01-312-10/+1
|
* Replace findersRobert Schilling2019-01-312-5/+5
|
* Incorporate feedback from NickRobert Schilling2019-01-317-23/+52
|
* Use a schema matcher to capture all entity membersRobert Schilling2019-01-312-0/+18
|
* Add changelog, version information, frozen string literalsRobert Schilling2019-01-313-0/+13
|
* Add subscription API for the group label APIRobert Schilling2019-01-314-16/+117
|
* Add specsRobert Schilling2019-01-313-8/+222
|
* Inital API implementation for group labelsRobert Schilling2019-01-312-0/+87
|
* Merge branch '55199-sentry-client-changes' into 'master'Sean McGivern2019-01-319-41/+334
|\ | | | | | | | | Update Sentry client to get project list See merge request gitlab-org/gitlab-ce!24672
| * Update Sentry client to get project listReuben Pereira2019-01-319-41/+334
|/
* Merge branch 'hnk-master-patch-61932' into 'master'Filipa Lacerda2019-01-313-4/+9
|\ | | | | | | | | | | | | Update runner admin page to make description field larger Closes #54639 See merge request gitlab-org/gitlab-ce!23593
| * Update runner admin page to make description field largerSascha Reynolds2019-01-303-4/+9
| | | | | | | | | | | | This changes the table with for the desciption and version fields to make the runner descriptions more readable. added changelog
* | Merge branch 'tz-reduce-js-bundle-select2' into 'master'Filipa Lacerda2019-01-319-313/+350
|\ \ | | | | | | | | | | | | | | | | | | Reduce Bundle Size by making select2 loading optional Closes #56988 See merge request gitlab-org/gitlab-ce!24727
| * | Wraps Select 2 Import into its own webpack bundleTim Zallmann2019-01-299-313/+350
| | | | | | | | | | | | | | | | | | | | | | | | Wraps all imports for select 2 to deferred imports, especially in the main.js we are actually checking if there is any select 2 element on the page or not.
* | | Merge branch 'fix/49388' into 'master'Grzegorz Bizon2019-01-319-73/+97
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix metrics graphs environments dropdown Closes #49388 See merge request gitlab-org/gitlab-ce!24441
| * | | Support flat response for envs index routesyasonik2019-01-219-73/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support environment folders in the UI on the Environments List page, the environments index route previously returned one environment per folder, excluding those other than the latest deploy. However, the environtments dropdown on the metrics dashboard requires that any environment be selectable. To accommodate both use cases, support an optional 'nested' parameter in the index route to return either a flat, complete response or a nested response based on the use case in question. The new default response structure is the flat response.
* | | | Merge branch 'qa-ml-improve-git-repo-auth' into 'master'Rémy Coutable2019-01-313-58/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add git credentials to .netrc when needed Closes gitlab-org/quality/nightly#57 and #56857 See merge request gitlab-org/gitlab-ce!24691
| * | | | Don't use .netrc with SSHMark Lapierre2019-01-302-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug that required credentials when using SSH key auth when using LFS. That bug was fixed so we shouldn't need to add credentials to .netrc when using SSH anymore.
| * | | | Add git credentials to .netrc when neededMark Lapierre2019-01-283-57/+137
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid having to remember to call try_add_credentials_to_netrc after setting credentials.
* | | | | Merge branch '46111-add-avatar-of-last-commit-to-web-ide-status-bar' into ↵Phil Hughes2019-01-313-3/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Add Avatar from author of the last commit to WebIDE status bar" Closes #46111 See merge request gitlab-org/gitlab-ce!24785
| * | | | | Resolve "Add Avatar from author of the last commit to WebIDE status bar"Jose2019-01-313-3/+18
|/ / / / /
* | | | | 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.