summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-316-12/+37
* Update service specs to avoid instance variablesDouglas Barbosa Alexandre2016-08-313-40/+40
* Fix confidential issues should not be passed to WebhooksDouglas Barbosa Alexandre2016-08-315-22/+77
* Merge branch '21457-not-create-groups-for-unallowed-users-when-importing-proj...Robert Speicher2016-08-3117-99/+184
|\
| * Update CHANGELOGDouglas Barbosa Alexandre2016-08-311-3/+1
| * Refactoring Import::BaseController#find_or_create_namespaceDouglas Barbosa Alexandre2016-08-318-47/+53
| * Don't create groups for unallowed users when importing projectsDouglas Barbosa Alexandre2016-08-3112-56/+137
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2016-08-3035-118/+354
|\
| * Merge branch 'sh-lock-version-not-null' into 'master' Stan Hu2016-08-312-1/+14
| |\
| | * Remove not-null constraint on lock_version column if it existsStan Hu2016-08-302-1/+14
| * | Merge branch 'pipelines-layout-regression' into 'master' Fatih Acet2016-08-302-0/+4
| |\ \
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipelines-layou...pipelines-layout-regressionBryce2016-08-232-1/+2
| | |\ \
| | * | | Check for pipelines when setting page_gutter_class.Bryce2016-08-232-0/+3
| * | | | Merge branch 'issue-boards-search' into 'master' Fatih Acet2016-08-3010-104/+71
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Removed unused method from componentissue-boards-searchPhil Hughes2016-08-301-7/+0
| | * | | CHANGELOG itemPhil Hughes2016-08-301-0/+1
| | * | | Added search for all lists on issue boardsPhil Hughes2016-08-309-98/+71
| * | | | Merge branch 'project-specific-lfs' into 'master' Robert Speicher2016-08-3015-6/+208
| |\ \ \ \
| | * | | | Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfsPatricio Cano2016-08-3013-30/+43
| | * | | | Syntax and style fixes.Patricio Cano2016-08-302-2/+5
| | * | | | Added CHANGELOG, documentation, and API functionalityPatricio Cano2016-08-305-3/+19
| | * | | | Added project specific enable/disable setting for LFSPatricio Cano2016-08-309-1/+171
| * | | | | Merge branch 'created-icon-fix' into 'master' Fatih Acet2016-08-302-1/+8
| |\ \ \ \ \
| | * | | | | Resize created iconcreated-icon-fixAnnabel Dunstone2016-08-302-1/+8
| * | | | | | Merge branch 'prevent_authored_awardable_votes' into 'master' Robert Speicher2016-08-307-6/+49
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into prevent_authored_awardable_votesbarthc2016-08-3088-599/+1641
| | |\ \ \ \ \ \
| | * | | | | | | prevent authored awardable thumbs votesbarthc2016-08-302-7/+12
| | * | | | | | | prevent authored awardable thumbs votesbarthc2016-08-287-3/+41
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2016-08-3076-465/+1475
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'fix-changelog-8-11-4' into 'master' Stan Hu2016-08-301-5/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix CHANGELOGStan Hu2016-08-301-5/+1
| |/ / / / / / / /
| * | | | | | | | Merge branch 'lock_fix' into 'master' Stan Hu2016-08-302-1/+17
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Remove default value for lock_versionValery Sizov2016-08-302-1/+17
| |/ / / / / / /
| * | | | | | | Merge branch 'zj-remove-unused-ci-tables' into 'master' Robert Speicher2016-08-303-53/+12
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Drop unused CI tables and fileszj-remove-unused-ci-tablesZ.J. van de Weg2016-08-263-53/+12
| * | | | | | | Merge branch 'docs-update_gitlab_workhorse_for_8.11' into 'master' Achilleas Pipinellis2016-08-301-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | docs: make sure to update 8.10-to-8.11 workhorse version too (see !5983)Bjørn Øivind Bjørnsen2016-08-261-1/+1
| * | | | | | | | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-08-301-30/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update projects.md Miroslav Meca2016-08-251-30/+24
| * | | | | | | | | Merge branch 'add-time-repo-view' into 'master' Fatih Acet2016-08-303-5/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add last commit time to repo viewClement Ho2016-08-293-5/+17
| * | | | | | | | | | Merge branch '19721-issues-created-through-api-do-not-notify-label-subscriber...Douwe Maan2016-08-304-17/+49
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | if issue is not valid we revert back to the old labels when updatingtiagonbotelho2016-08-305-19/+17
| | * | | | | | | | | refactors update issue api request and some minor commentstiagonbotelho2016-08-304-22/+41
| | * | | | | | | | | adds test to check whether or not an email is sent to label subscribers after...tiagonbotelho2016-08-302-19/+19
| | * | | | | | | | | user is now notified when creating an issue through the apitiagonbotelho2016-08-302-2/+17
| * | | | | | | | | | Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-3034-109/+501
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix CHANGELOGartifacts-from-ref-and-build-nameLin Jen-Shin2016-08-261-2/+0
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-26145-750/+1721
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Fix testsLin Jen-Shin2016-08-261-3/+1