summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for some vue-resource to Axios refactor34534-switch-to-axiosEric Eastwood2018-01-021-0/+5
|
* Switch boards to AxiosEric Eastwood2018-01-0215-148/+131
|
* Switch blob/notebook to AxiosEric Eastwood2018-01-022-39/+23
|
* Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-0215-99/+75
|
* Switch issue_show to AxiosEric Eastwood2018-01-025-99/+67
|
* Fix mergeUrlParams encoding query parametersEric Eastwood2018-01-021-1/+1
| | | | | | | | Before: /-/boards/1/issues.json?page=1&per=50&scope=all&utf8=✓&state=opened&milestone_title=#upcoming After: /-/boards/1/issues.json?page=1&per=50&scope=all&utf8=%E2%9C%93&state=opened&milestone_title=%23upcoming
* Add `X-Requested-With: XMLHttpRequest` header so Rails can recognize XHREric Eastwood2018-01-021-0/+2
| | | | | Backport from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3732
* Merge branch 'fj-40053-error-500-members-list' into 'master'Douwe Maan2018-01-029-4/+164
|\ | | | | | | | | | | | | Fix user membership destroy relation Closes #40053 See merge request gitlab-org/gitlab-ce!15970
| * Fix user membership destroy relationFrancisco Javier López2018-01-029-4/+164
| |
* | Merge branch 'qa-add-deploy-key' into 'master'Grzegorz Bizon2018-01-0215-13/+178
|\ \ | | | | | | | | | | | | QA: Add a scenario for adding a deploy key See merge request gitlab-org/gitlab-ce!16096
| * | Use heredoc so it's more clearLin Jen-Shin2018-01-021-6/+8
| | |
| * | Put all menus under menu moduleLin Jen-Shin2018-01-027-12/+12
| | |
| * | Introduce common project settings and just putLin Jen-Shin2018-01-024-16/+24
| | | | | | | | | | | | everything in the scenario without a before block.
| * | Introduce Factory::Resource::DeployKeyLin Jen-Shin2018-01-023-16/+35
| | |
| * | Introduce expand_deploy_keysLin Jen-Shin2018-01-023-18/+26
| | |
| * | Introduce Menu::SideLin Jen-Shin2018-01-024-21/+34
| | |
| * | Just add a new class to locate the expand buttonLin Jen-Shin2017-12-282-6/+2
| | |
| * | Update descriptions and names based on feedbackLin Jen-Shin2017-12-281-7/+7
| | |
| * | Rename DeployKey to DeployKeysLin Jen-Shin2017-12-283-4/+4
| | |
| * | QA: Add a scenario for adding a deploy keyLin Jen-Shin2017-12-286-0/+119
| | |
* | | Merge branch 'fix-volume-backup' into 'master'Douwe Maan2018-01-022-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ignore "lost+found" folder during backup on a volume Closes #22672 and #17574 See merge request gitlab-org/gitlab-ce!16036
| * | | Add changelogjulien MILLAU2017-12-201-0/+5
| | | |
| * | | Ignore "lost+found" folder during backup on a volumejulien MILLAU2017-12-201-3/+3
| | | |
* | | | Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' ↵Douwe Maan2018-01-022-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs. See merge request gitlab-org/gitlab-ce!16175
| * | | | Update prometheus gem to version that adds inf+ bucket in accordance with ↵Pawel Chojnacki2018-01-022-3/+3
| | | | | | | | | | | | | | | | | | | | Prometheus docs.
* | | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-025-12/+63
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Forking a project to a namespace with lower visibility Closes #40022 See merge request gitlab-org/gitlab-ce!16050
| * | | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-295-12/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
* | | | | Merge branch '38596-fix-backspace-visual-token-clearing' into 'master'LUKE BENNETT2018-01-024-15/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clears visual token on second backspace Closes #38596 See merge request gitlab-org/gitlab-ce!15348
| * | | | | Clears visual token on second backspaceMartin Wortschack2018-01-024-15/+51
|/ / / / /
* | | | | Merge branch ↵Sean McGivern2018-01-023-4/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrations' into 'master' Prevent schema.rb reverting from datetime_with_timezone to datetime Closes #39289 See merge request gitlab-org/gitlab-ce!14956
| * | | | | Prevent schema.rb reverting from datetime_with_timezone to datetime39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrationsJames Edwards-Jones2017-12-073-4/+34
| | | | | |
* | | | | | Merge branch '40780-choose-file' into 'master'Tim Zallmann2018-01-025-30/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Rename "Browse file" inputs to "Choose file"" Closes #40780 See merge request gitlab-org/gitlab-ce!16092
| * | | | | Uniform style between all upload forms40780-choose-fileFilipa Lacerda2017-12-224-30/+23
| | | | | |
| * | | | | Update Browse file to Choose file in all occurencesFilipa Lacerda2017-12-213-2/+7
| | | | | |
* | | | | | Merge branch '40274-user-settings-breadcrumbs' into 'master'Sean McGivern2018-01-025-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix breadcrumbs in User Settings Closes #40274 See merge request gitlab-org/gitlab-ce!16172
| * | | | | | Add breadcrumbs to User Settings sub-viewsRob Watson2018-01-015-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40274
* | | | | | | Merge branch 'change-asset-sync-env-variables' into 'master'Marin Jankovski2018-01-021-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename asset sync related AWS variables See merge request gitlab-org/gitlab-ce!16154
| * | | | | | | Rename asset sync related AWS variableschange-asset-sync-env-variablesBalasankar "Balu" C2018-01-011-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'sh-fix-spam-update-404' into 'master'Sean McGivern2018-01-012-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 error after a user edits an issue description and solves the reCAPTCHA Closes #41445 See merge request gitlab-org/gitlab-ce!16167
| * | | | | | | Fix 404 error after a user edits an issue description and solves the reCAPTCHAsh-fix-spam-update-404Stan Hu2017-12-302-1/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When editing an issue, use the PUT method instead of POST to avoid a 404 after solving the reCAPTCHA. Closes #41445
* | | | | | | Merge branch 'jira-doc-resolution' into 'master'Sean McGivern2018-01-011-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Documenting that resolved JIRA tickets are not automatically transitioned See merge request gitlab-org/gitlab-ce!16162
| * | | | | | Typos correction on the advise of @smcgivernEdouard2017-12-291-4/+4
| | | | | | |
| * | | | | | Documenting that resolved JIRA tickets are not automatically transitionedEdouard2017-12-291-0/+5
| | | | | | |
* | | | | | | Merge branch 'fix/profile-settings-content-width' into 'master'Robert Speicher2017-12-292-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust content width for User Settings, GPG Keys See merge request gitlab-org/gitlab-ce!16093
| * | | | | | | Adjust content width for User Settings, GPG KeysGeorge Tsiolis2017-12-282-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Limit content width for fixed layout
* | | | | | | | Merge branch 'fix/profile-settings-sidebar-heading' into 'master'Robert Speicher2017-12-293-4/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep typographic hierarchy in User Settings See merge request gitlab-org/gitlab-ce!16090
| * | | | | | | | Keep typographic hierarchy in User SettingsGeorge Tsiolis2017-12-293-4/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Authentication log - Notifications
* | | | | | | | Merge branch '41492-mr-comment-fix' into 'master'Sean McGivern2017-12-294-16/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix links to old commits in merge request comments Closes #41492 See merge request gitlab-org/gitlab-ce!16152
| * | | | | | | | Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-294-16/+78
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '20035-pause-resume-runners' into 'master'Grzegorz Bizon2017-12-295-6/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pause/resume button to project runners Closes #20035 See merge request gitlab-org/gitlab-ce!16032