summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-292-11/+50
|\
| * Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularityRémy Coutable2017-06-281-4/+4
| * Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-271-0/+1
| * Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-272-11/+49
* | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+34
|\ \
| * | Added code for defining SHA attributesYorick Peterse2017-06-291-0/+34
* | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-1/+2
|\ \ \
| * | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-1/+2
* | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-2912-3/+1230
|\ \ \ \
| * | | | use subject scope in :id/usershttp://jneen.net/2017-06-271-1/+3
| * | | | convert all the policies to DeclarativePolicyhttp://jneen.net/2017-06-271-2/+2
| * | | | implement Presenter::Base#declarative_policy_delegatehttp://jneen.net/2017-06-271-0/+5
| * | | | add a new DeclarativePolicy frameworkhttp://jneen.net/2017-06-279-0/+1220
| | |_|/ | |/| |
* | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into 'm...Douwe Maan2017-06-292-2/+10
|\ \ \ \
| * | | | Rename members_count to members_count_with_descendants and expose only to gro...Oswaldo Ferreira2017-06-282-3/+7
| * | | | Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-281-1/+5
* | | | | Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_u...Rémy Coutable2017-06-291-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updatedAlejandro Rodríguez2017-06-281-0/+2
| |/ / /
* | | | Merge branch 'bvl-rename-all-reserved-paths' into 'master'Sean McGivern2017-06-294-20/+139
|\ \ \ \
| * | | | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysqlBob Van Landuyt2017-06-271-2/+2
| * | | | Only do one query for updating routesBob Van Landuyt2017-06-271-5/+15
| * | | | Update routes directly by ID instead of filtering by pathBob Van Landuyt2017-06-261-4/+12
| * | | | Clear the cache for projects one-by-oneBob Van Landuyt2017-06-261-14/+16
| * | | | Add punctuation to log messagesBob Van Landuyt2017-06-263-4/+6
| * | | | Keep failed renames in redisBob Van Landuyt2017-06-261-1/+13
| * | | | Use the migration name as a key in redisBob Van Landuyt2017-06-261-1/+1
| * | | | Don't break rolling back when a namespace or project was renamedBob Van Landuyt2017-06-262-5/+7
| * | | | More logging so we know we have the rename in redisBob Van Landuyt2017-06-261-1/+5
| * | | | Revert renames from a migrationBob Van Landuyt2017-06-261-0/+5
| * | | | Revert namespace renamesBob Van Landuyt2017-06-262-1/+23
| * | | | Add methods to revert project renamesBob Van Landuyt2017-06-262-6/+49
| * | | | Track all renames in redisBob Van Landuyt2017-06-263-0/+9
* | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-292-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix current feature related specsTiago Botelho2017-06-282-2/+4
* | | | | Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-283-11/+20
|\ \ \ \ \
| * | | | | Fix gitaly ref encoding bugsJacob Vosmaer2017-06-283-11/+20
| |/ / / /
* | | | | Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-281-1/+1
|\ \ \ \ \
| * | | | | Fix diff of requirements.txt file by not matching newlines as part of package...dm-dependency-linker-newlinesDouwe Maan2017-06-271-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-281-1/+1
* | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-281-21/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-271-21/+26
* | | | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master'Grzegorz Bizon2017-06-271-0/+3
|\ \ \ \ \
| * | | | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-statusKamil Trzcinski2017-06-271-0/+3
| |/ / / /
* | | | | Merge branch 'backport-system-check-fix' into 'master'Douwe Maan2017-06-271-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make the SimpleExecutor rescue exceptions in the executing ChecksGabriel Mazetto2017-06-271-0/+2
* | | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-272-80/+70
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove 'contains' option from Commit.find_allJacob Vosmaer2017-06-271-6/+1
| * | | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-272-80/+75
* | | | | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-271-0/+1
|\ \ \ \ \
View Lorry Controller Status