summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add member: Always return 409 when a member existsJarka Kadlecova2017-02-107-12/+487
|
* Merge branch 'docs/prometheus' into 'master' Achilleas Pipinellis2017-02-098-104/+273
|\ | | | | | | | | | | | | Update Prometheus documentation Closes #27735 See merge request !9060
| * Consider existing installations where the setting is not in gitlab.rbAchilleas Pipinellis2017-02-094-5/+5
| | | | | | | | [ci skip]
| * Change to direct link for Omnibus Nginx docsAchilleas Pipinellis2017-02-091-1/+1
| | | | | | | | [ci skip]
| * Add info on changing the default address/port Prometheus listens onAchilleas Pipinellis2017-02-091-0/+24
| | | | | | | | | | | | Reported in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1905 [ci skip]
| * Fix GitLab monitor Omnibus settingAchilleas Pipinellis2017-02-091-1/+1
| | | | | | | | [ci skip]
| * Add link to issue where HSTS is discusseddocs/prometheusAchilleas Pipinellis2017-02-091-1/+3
| | | | | | | | [ci skip]
| * Add changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8764Achilleas Pipinellis2017-02-091-3/+22
| |
| * Use underscores instead of dashes in gitlab.rbAchilleas Pipinellis2017-02-082-2/+2
| | | | | | | | [ci skip]
| * Add GitLab monitor exporter docsAchilleas Pipinellis2017-02-082-0/+36
| |
| * Add postgres exporter to Prometheus docsAchilleas Pipinellis2017-02-082-0/+36
| |
| * Use localhost for node_exporterAchilleas Pipinellis2017-02-081-4/+2
| |
| * Add Redis exporter to Prometheus docsAchilleas Pipinellis2017-02-082-0/+39
| |
| * Split node_exporter to its own pageAchilleas Pipinellis2017-02-082-29/+43
| |
| * Move prometheus docs into their own dirAchilleas Pipinellis2017-02-084-104/+105
| | | | | | | | [ci skip]
* | Merge branch 'dz-create-nested-groups-via-ui' into 'master' Dmitriy Zaporozhets2017-02-0911-54/+115
|\ \ | | | | | | | | | | | | Allow creating nested group via UI See merge request !8786
| * | Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-0711-54/+115
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'dz-nested-groups-api' into 'master' Dmitriy Zaporozhets2017-02-095-3/+27
|\ \ \ | | | | | | | | | | | | | | | | Nested groups API See merge request !9034
| * | | Add nested groups to the APIdz-nested-groups-apiDmitriy Zaporozhets2017-02-085-3/+27
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'docs/omniauth-fix-link' into 'master' Achilleas Pipinellis2017-02-0911-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix markdown link in Omniauth docs See merge request !9082
| * | | | Fix markdown link in Omniauth docsAchilleas Pipinellis2017-02-0911-11/+11
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'docs/omniauth-restart' into 'master' Achilleas Pipinellis2017-02-0911-32/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention reconfigure/restart in omniauth docs Closes #27901 See merge request !9081
| * | | | Mention reconfigure/restart in omniauth docsAchilleas Pipinellis2017-02-0911-32/+73
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'dm-add-column-with-default-cop' into 'master' Douwe Maan2017-02-097-8/+97
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add cop that checks if add_column_with_default is used with up/down methods See merge request !9077
| * | | | Migration does not require downtimeDouwe Maan2017-02-081-0/+2
| | | | |
| * | | | Satisfy the new rubocop :)Douwe Maan2017-02-082-2/+10
| | | | |
| * | | | Explicitly require rubocop migration_helpersdm-add-column-with-default-copDouwe Maan2017-02-083-1/+4
| | | | |
| * | | | Add cop that checks if add_column_with_default is used with up/down methodsDouwe Maan2017-02-085-5/+81
| | | | |
* | | | | Merge branch 'feature-freeze-exceptions' into 'master' Robert Speicher2017-02-091-10/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Describe process around cherry-picking during the feature freeze See merge request !9075
| * | | | | Add an ordered list with the 3 people who need to sign offDouwe Maan2017-02-081-2/+8
| | | | | |
| * | | | | Rephrase some thingsfeature-freeze-exceptionsDouwe Maan2017-02-081-10/+12
| | | | | |
| * | | | | Too many releasesDouwe Maan2017-02-081-1/+1
| | | | | |
| * | | | | Small rephraseDouwe Maan2017-02-081-1/+1
| | | | | |
| * | | | | Describe process around cherry-picking during the feature freezeDouwe Maan2017-02-081-9/+19
| |/ / / /
* | | | | Merge branch 'remove-jquery-ui-datepicker' into 'master' Jacob Schatz2017-02-0820-224/+183
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI datepicker See merge request !8421
| * | | | | Changed date check testremove-jquery-ui-datepickerPhil Hughes2017-02-066-31/+29
| | | | | |
| * | | | | Fixed missing edit link clickPhil Hughes2017-02-062-2/+3
| | | | | |
| * | | | | Fixed some specsPhil Hughes2017-02-068-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG item
| * | | | | Updated styles for PikadayPhil Hughes2017-02-068-172/+73
| | | | | |
| * | | | | Replaced more jQuery UI datepickersPhil Hughes2017-02-066-25/+70
| | | | | |
| * | | | | Removed jQuery UI datepickerPhil Hughes2017-02-067-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | Part of #18437 to remove jQuery UI. This removes the datepicker
* | | | | | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-0819-135/+160
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI sortable See merge request !8478
| * | | | | | Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-0619-135/+160
| |/ / / / /
* | | | | | Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-082-11/+28
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Fix route rename descendants if route.name is blank See merge request !9074
| * | | | | Fix route rename descendants if route.name is blankDmitriy Zaporozhets2017-02-082-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-084-4/+36
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bypass signup domain validation for external users Closes #25279 See merge request !8575
| * | | | | Bypass signup domain validation for external usersReza Mohammadi2017-02-084-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #25279
* | | | | | Merge branch 'mr-widget-pipelines' into 'master' Fatih Acet2017-02-081-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce padding of mr widget mini graph See merge request !9071
| * | | | | | Reduce padding of mr widget mini graphAnnabel Dunstone Gray2017-02-081-0/+6
| | | | | | |
* | | | | | | Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-084-5/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010