Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add member: Always return 409 when a member exists | Jarka Kadlecova | 2017-02-10 | 7 | -12/+487 |
| | |||||
* | Merge branch 'docs/prometheus' into 'master' | Achilleas Pipinellis | 2017-02-09 | 8 | -104/+273 |
|\ | | | | | | | | | | | | | Update Prometheus documentation Closes #27735 See merge request !9060 | ||||
| * | Consider existing installations where the setting is not in gitlab.rb | Achilleas Pipinellis | 2017-02-09 | 4 | -5/+5 |
| | | | | | | | | [ci skip] | ||||
| * | Change to direct link for Omnibus Nginx docs | Achilleas Pipinellis | 2017-02-09 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Add info on changing the default address/port Prometheus listens on | Achilleas Pipinellis | 2017-02-09 | 1 | -0/+24 |
| | | | | | | | | | | | | Reported in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1905 [ci skip] | ||||
| * | Fix GitLab monitor Omnibus setting | Achilleas Pipinellis | 2017-02-09 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Add link to issue where HSTS is discusseddocs/prometheus | Achilleas Pipinellis | 2017-02-09 | 1 | -1/+3 |
| | | | | | | | | [ci skip] | ||||
| * | Add changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8764 | Achilleas Pipinellis | 2017-02-09 | 1 | -3/+22 |
| | | |||||
| * | Use underscores instead of dashes in gitlab.rb | Achilleas Pipinellis | 2017-02-08 | 2 | -2/+2 |
| | | | | | | | | [ci skip] | ||||
| * | Add GitLab monitor exporter docs | Achilleas Pipinellis | 2017-02-08 | 2 | -0/+36 |
| | | |||||
| * | Add postgres exporter to Prometheus docs | Achilleas Pipinellis | 2017-02-08 | 2 | -0/+36 |
| | | |||||
| * | Use localhost for node_exporter | Achilleas Pipinellis | 2017-02-08 | 1 | -4/+2 |
| | | |||||
| * | Add Redis exporter to Prometheus docs | Achilleas Pipinellis | 2017-02-08 | 2 | -0/+39 |
| | | |||||
| * | Split node_exporter to its own page | Achilleas Pipinellis | 2017-02-08 | 2 | -29/+43 |
| | | |||||
| * | Move prometheus docs into their own dir | Achilleas Pipinellis | 2017-02-08 | 4 | -104/+105 |
| | | | | | | | | [ci skip] | ||||
* | | Merge branch 'dz-create-nested-groups-via-ui' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 11 | -54/+115 |
|\ \ | | | | | | | | | | | | | Allow creating nested group via UI See merge request !8786 | ||||
| * | | Allow creating nested group via UIdz-create-nested-groups-via-ui | Dmitriy Zaporozhets | 2017-02-07 | 11 | -54/+115 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'dz-nested-groups-api' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 5 | -3/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | Nested groups API See merge request !9034 | ||||
| * | | | Add nested groups to the APIdz-nested-groups-api | Dmitriy Zaporozhets | 2017-02-08 | 5 | -3/+27 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'docs/omniauth-fix-link' into 'master' | Achilleas Pipinellis | 2017-02-09 | 11 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix markdown link in Omniauth docs See merge request !9082 | ||||
| * | | | | Fix markdown link in Omniauth docs | Achilleas Pipinellis | 2017-02-09 | 11 | -11/+11 |
|/ / / / | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'docs/omniauth-restart' into 'master' | Achilleas Pipinellis | 2017-02-09 | 11 | -32/+73 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention reconfigure/restart in omniauth docs Closes #27901 See merge request !9081 | ||||
| * | | | | Mention reconfigure/restart in omniauth docs | Achilleas Pipinellis | 2017-02-09 | 11 | -32/+73 |
|/ / / / | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'dm-add-column-with-default-cop' into 'master' | Douwe Maan | 2017-02-09 | 7 | -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 downtime | Douwe Maan | 2017-02-08 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Satisfy the new rubocop :) | Douwe Maan | 2017-02-08 | 2 | -2/+10 |
| | | | | | |||||
| * | | | | Explicitly require rubocop migration_helpersdm-add-column-with-default-cop | Douwe Maan | 2017-02-08 | 3 | -1/+4 |
| | | | | | |||||
| * | | | | Add cop that checks if add_column_with_default is used with up/down methods | Douwe Maan | 2017-02-08 | 5 | -5/+81 |
| | | | | | |||||
* | | | | | Merge branch 'feature-freeze-exceptions' into 'master' | Robert Speicher | 2017-02-09 | 1 | -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 off | Douwe Maan | 2017-02-08 | 1 | -2/+8 |
| | | | | | | |||||
| * | | | | | Rephrase some thingsfeature-freeze-exceptions | Douwe Maan | 2017-02-08 | 1 | -10/+12 |
| | | | | | | |||||
| * | | | | | Too many releases | Douwe Maan | 2017-02-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Small rephrase | Douwe Maan | 2017-02-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Describe process around cherry-picking during the feature freeze | Douwe Maan | 2017-02-08 | 1 | -9/+19 |
| |/ / / / | |||||
* | | | | | Merge branch 'remove-jquery-ui-datepicker' into 'master' | Jacob Schatz | 2017-02-08 | 20 | -224/+183 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI datepicker See merge request !8421 | ||||
| * | | | | | Changed date check testremove-jquery-ui-datepicker | Phil Hughes | 2017-02-06 | 6 | -31/+29 |
| | | | | | | |||||
| * | | | | | Fixed missing edit link click | Phil Hughes | 2017-02-06 | 2 | -2/+3 |
| | | | | | | |||||
| * | | | | | Fixed some specs | Phil Hughes | 2017-02-06 | 8 | -36/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG item | ||||
| * | | | | | Updated styles for Pikaday | Phil Hughes | 2017-02-06 | 8 | -172/+73 |
| | | | | | | |||||
| * | | | | | Replaced more jQuery UI datepickers | Phil Hughes | 2017-02-06 | 6 | -25/+70 |
| | | | | | | |||||
| * | | | | | Removed jQuery UI datepicker | Phil Hughes | 2017-02-06 | 7 | -14/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | Part of #18437 to remove jQuery UI. This removes the datepicker | ||||
* | | | | | | Merge branch 'remove-jquery-ui-sortable' into 'master' | Jacob Schatz | 2017-02-08 | 19 | -135/+160 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI sortable See merge request !8478 | ||||
| * | | | | | | Removed jQuery UI sortableremove-jquery-ui-sortable | Phil Hughes | 2017-02-06 | 19 | -135/+160 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dz-fix-route-rename-descendants' into 'master' | Dmitriy Zaporozhets | 2017-02-08 | 2 | -11/+28 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Fix route rename descendants if route.name is blank See merge request !9074 | ||||
| * | | | | | Fix route rename descendants if route.name is blank | Dmitriy Zaporozhets | 2017-02-08 | 2 | -11/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch 'bypass-whitelist-for-external-user' into 'master' | Robert Speicher | 2017-02-08 | 4 | -4/+36 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bypass signup domain validation for external users Closes #25279 See merge request !8575 | ||||
| * | | | | | Bypass signup domain validation for external users | Reza Mohammadi | 2017-02-08 | 4 | -4/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #25279 | ||||
* | | | | | | Merge branch 'mr-widget-pipelines' into 'master' | Fatih Acet | 2017-02-08 | 1 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce padding of mr widget mini graph See merge request !9071 | ||||
| * | | | | | | Reduce padding of mr widget mini graph | Annabel Dunstone Gray | 2017-02-08 | 1 | -0/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch '27756-fix-json-404-response' into 'master' | Clement Ho | 2017-02-08 | 4 | -5/+28 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010 |