Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't fail on an empty databasezj-drop-gitorious-field | Z.J. van de Weg | 2016-09-05 | 2 | -6/+11 |
* | Support MySQL too, when removing gitorious from import_sources | Z.J. van de Weg | 2016-09-05 | 1 | -1/+5 |
* | Remove gitorious from import_sources on ApplicationSetting model | Z.J. van de Weg | 2016-09-05 | 3 | -1/+33 |
* | Merge branch 'fix-changelog' into 'master' | Rémy Coutable | 2016-09-05 | 1 | -3/+3 |
|\ | |||||
| * | Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12fix-changelog | Winnie | 2016-09-02 | 1 | -3/+3 |
* | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq | Rémy Coutable | 2016-09-05 | 36 | -186/+424 |
|\ \ | |||||
| * \ | Merge branch 'fix-confidential-issues-webhooks' into 'master' | Douwe Maan | 2016-09-01 | 20 | -90/+238 |
| |\ \ | |||||
| | * | | Add migration to set confidential issues events on web hooks | Douglas Barbosa Alexandre | 2016-09-01 | 2 | -1/+16 |
| | * | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-08-31 | 1 | -0/+1 |
| | * | | Scope hooks thal will run for confidential issues | Douglas Barbosa Alexandre | 2016-08-31 | 7 | -22/+55 |
| | * | | Add option to confidential issues events to trigger services | Douglas Barbosa Alexandre | 2016-08-31 | 7 | -18/+37 |
| | * | | Add option to confidential issues events to trigger Webhooks | Douglas Barbosa Alexandre | 2016-08-31 | 6 | -12/+37 |
| | * | | Update service specs to avoid instance variables | Douglas Barbosa Alexandre | 2016-08-31 | 3 | -40/+40 |
| | * | | Fix confidential issues should not be passed to Webhooks | Douglas Barbosa Alexandre | 2016-08-31 | 5 | -22/+77 |
| |/ / | |||||
| * | | Merge branch '21457-not-create-groups-for-unallowed-users-when-importing-proj... | Robert Speicher | 2016-08-31 | 17 | -99/+184 |
| |\ \ | |||||
| | * | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-08-31 | 1 | -3/+1 |
| | * | | Refactoring Import::BaseController#find_or_create_namespace | Douglas Barbosa Alexandre | 2016-08-31 | 8 | -47/+53 |
| | * | | Don't create groups for unallowed users when importing projects | Douglas Barbosa Alexandre | 2016-08-31 | 12 | -56/+137 |
| |/ / | |||||
* | | | Merge branch 'fix-missing-flash-messages' into 'master' | Rémy Coutable | 2016-09-05 | 3 | -3/+19 |
|\ \ \ | |||||
| * | | | Fix missing flash messages on service edit page | Airat Shigapov | 2016-09-05 | 3 | -3/+19 |
* | | | | Merge branch 'safe-ref-updates' into 'master' | Douwe Maan | 2016-09-05 | 5 | -29/+56 |
|\ \ \ \ | |||||
| * | | | | Make error message appropriate for end users | Jacob Vosmaer | 2016-09-02 | 1 | -2/+2 |
| * | | | | Use 'git update-ref' for safer web commits | Jacob Vosmaer | 2016-09-02 | 5 | -29/+56 |
* | | | | | Merge branch 'docs-gitlab-ci-dropdown' into 'master' | Achilleas Pipinellis | 2016-09-05 | 19 | -156/+177 |
|\ \ \ \ \ | |||||
| * | | | | | Move docs for template dropdowns to the new locationdocs-gitlab-ci-dropdown | Achilleas Pipinellis | 2016-09-02 | 6 | -14/+24 |
| * | | | | | Move web_editor doc to new location | Achilleas Pipinellis | 2016-09-02 | 15 | -152/+153 |
| * | | | | | Correct spelling of therefore [ci skip] | Z.J. van de Weg | 2016-09-02 | 1 | -1/+1 |
| * | | | | | Add documentation on template dropdowns | Z.J. van de Weg | 2016-09-02 | 4 | -3/+13 |
* | | | | | | Merge branch 'patch-5' into 'master' | Achilleas Pipinellis | 2016-09-05 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Update README.md | Gustav Trenwith | 2016-09-05 | 1 | -1/+1 |
| * | | | | | Update README.md | Gustav Trenwith | 2016-09-02 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'zj-add-link-docs-index' into 'master' | Achilleas Pipinellis | 2016-09-04 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add link on API docs index pagezj-add-link-docs-index | Z.J. van de Weg | 2016-09-03 | 1 | -1/+2 |
* | | | | | | Merge branch 'fix-spec-failures-diff-spec' into 'master' | Stan Hu | 2016-09-04 | 1 | -0/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix randomly failing specs in expand_collapse_diff_spec: | Stan Hu | 2016-09-03 | 1 | -0/+7 |
|/ / / / / | |||||
* | | | | | Merge branch 'fix-suggested-colors-underline' into 'master' | Annabel Dunstone Gray | 2016-09-02 | 2 | -0/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Remove suggested colors hover underline | Clement Ho | 2016-09-02 | 2 | -0/+2 |
* | | | | | Merge branch 'icon-button-alignment' into 'master' | Fatih Acet | 2016-09-02 | 4 | -5/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Fix alignment of icon buttons (!5887) | winniehell | 2016-08-19 | 4 | -5/+8 |
* | | | | | | Merge branch 'fix-wiki-anchor-interaction' into 'master' | Fatih Acet | 2016-09-02 | 4 | -17/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix markdown anchor icon interaction | Clement Ho | 2016-09-02 | 4 | -17/+12 |
* | | | | | | | Merge branch '21471-bold-text-in-ci-build-output-not-styled' into 'master' | Annabel Dunstone Gray | 2016-09-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added `.term-bold` declaration.21471-bold-text-in-ci-build-output-not-styled | Luke "Jared" Bennett | 2016-09-02 | 1 | -0/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-add-button-alignment' into 'master' | Fatih Acet | 2016-09-02 | 2 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Align add button on repository view | Clement Ho | 2016-09-01 | 2 | -0/+5 |
* | | | | | | | | Merge branch 'replace-coffeescript' into 'master' | Fatih Acet | 2016-09-02 | 3 | -50/+65 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Convert datetime coffeescript spec to ES6 | Clement Ho | 2016-09-01 | 3 | -50/+65 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'project-edit-features-hide' into 'master' | Fatih Acet | 2016-09-02 | 4 | -18/+86 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Refactored code to rely less on IDs that could changeproject-edit-features-hide | Phil Hughes | 2016-09-02 | 2 | -6/+14 |
| * | | | | | | | | Hides merge request section in edit project when disabled | Phil Hughes | 2016-09-02 | 3 | -15/+75 |
| | |/ / / / / / | |/| | | | | | |