Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Banzai: Add tooltip attributes to reference filter.acet-fix-tooltip-placement | Fatih Acet | 2017-07-03 | 1 | -0/+2 |
| | |||||
* | Speed up operations performed by gitlab-shell | Stan Hu | 2017-07-03 | 1 | -21/+48 |
| | |||||
* | Merge branch 'change-extended-docker-configuration-syntax' into 'master' | Grzegorz Bizon | 2017-07-02 | 2 | -3/+3 |
|\ | | | | | | | | | Make entrypoint and command keys to be array of strings See merge request !12536 | ||||
| * | Make entrypoint and command keys to be array of strings | Tomasz Maczukin | 2017-07-02 | 2 | -3/+3 |
| | | |||||
* | | Merge branch 'enable-webpack-code-splitting' into 'master' | Jacob Schatz | 2017-06-30 | 1 | -0/+3 |
|\ \ | |/ |/| | | | | | | | | | Enable webpack code splitting Closes #32989 See merge request !12032 | ||||
| * | configure webpack publicPath dynamically to account for CDN or relative path ↵ | Mike Greiling | 2017-06-28 | 1 | -0/+3 |
| | | | | | | | | settings | ||||
* | | Improve support for external issue referencesadam-external-issue-references-spike | Adam Niedzielski | 2017-06-30 | 4 | -49/+5 |
| | | |||||
* | | Merge branch ↵ | Dmitriy Zaporozhets | 2017-06-30 | 1 | -3/+5 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '34502-gitlab-git-hook-should-set-the-gl_repository-environment-variable' into 'master' Set the GL_REPOSITORY env variable on Gitlab::Git::Hook Closes #34502 See merge request !12572 | ||||
| * | | Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variable | Alejandro Rodríguez | 2017-06-29 | 1 | -3/+5 |
| | | | |||||
* | | | bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloading | http://jneen.net/ | 2017-06-29 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' ↵ | Robert Speicher | 2017-06-29 | 2 | -11/+50 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Allow the feature flags to be enabled/disabled with more granularity Closes #34078 See merge request !12357 | ||||
| * | | Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularity | Rémy Coutable | 2017-06-28 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ↵ | Rémy Coutable | 2017-06-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | exclusive Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Allow the feature flags to be enabled/disabled with more granularity | Rémy Coutable | 2017-06-27 | 2 | -11/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows to enable/disable a feature flag for a given user, or a given Flipper group (must be declared statically in the `flipper.rb` initializer beforehand). Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master' | Sean McGivern | 2017-06-29 | 1 | -0/+34 |
|\ \ \ | | | | | | | | | | | | | | | | | Added code for defining SHA attributes See merge request !12555 | ||||
| * | | | Added code for defining SHA attributes | Yorick Peterse | 2017-06-29 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | These attributes are stored in binary in the database, but exposed as strings. This allows one to query/create data using plain SHA1 hashes as Strings, while storing them more efficiently as binary. | ||||
* | | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master' | Kamil Trzciński | 2017-06-29 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only count GL pipelines in usage data ping Closes #33172 See merge request !12277 | ||||
| * | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelines | Z.J. van de Weg | 2017-06-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending the usage data, it now includes all pipelines. This commit will split the pipelines in two; internal and external. This will lead to historical data being incorrectly marked this way. Fixes gitlab-org/gitlab-ce#33172 | ||||
* | | | | | Merge branch 'refactor/declarative-policy' into 'master' | Sean McGivern | 2017-06-29 | 12 | -3/+1230 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/declarative policy See merge request !10515 | ||||
| * | | | | | use subject scope in :id/users | http://jneen.net/ | 2017-06-27 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | since we're loading all the members anyways | ||||
| * | | | | | convert all the policies to DeclarativePolicy | http://jneen.net/ | 2017-06-27 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | implement Presenter::Base#declarative_policy_delegate | http://jneen.net/ | 2017-06-27 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | add a new DeclarativePolicy framework | http://jneen.net/ | 2017-06-27 | 9 | -0/+1220 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into ↵ | Douwe Maan | 2017-06-29 | 2 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add group members counting related data on namespaces API See merge request !12497 | ||||
| * | | | | | Rename members_count to members_count_with_descendants and expose only to ↵ | Oswaldo Ferreira | 2017-06-28 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | group admins | ||||
| * | | | | | Add "members_count" and "parent_id" data on namespaces API | Oswaldo Ferreira | 2017-06-28 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge branch ↵ | Rémy Coutable | 2017-06-29 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated' into 'master' Fix a bug where an invalid sort param value was passed to Gitaly Closes #34280 See merge request !12534 | ||||
| * | | | | | Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated | Alejandro Rodríguez | 2017-06-28 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'bvl-rename-all-reserved-paths' into 'master' | Sean McGivern | 2017-06-29 | 4 | -20/+139 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename all forbidden paths again Closes #32625 See merge request !11713 | ||||
| * | | | | | Adjust for new static-analysis failuresbvl-rename-all-reserved-paths-mysql | Bob Van Landuyt | 2017-06-27 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Only do one query for updating routes | Bob Van Landuyt | 2017-06-27 | 1 | -5/+15 |
| | | | | | | |||||
| * | | | | | Update routes directly by ID instead of filtering by path | Bob Van Landuyt | 2017-06-26 | 1 | -4/+12 |
| | | | | | | |||||
| * | | | | | Clear the cache for projects one-by-one | Bob Van Landuyt | 2017-06-26 | 1 | -14/+16 |
| | | | | | | |||||
| * | | | | | Add punctuation to log messages | Bob Van Landuyt | 2017-06-26 | 3 | -4/+6 |
| | | | | | | |||||
| * | | | | | Keep failed renames in redis | Bob Van Landuyt | 2017-06-26 | 1 | -1/+13 |
| | | | | | | |||||
| * | | | | | Use the migration name as a key in redis | Bob Van Landuyt | 2017-06-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Don't break rolling back when a namespace or project was renamed | Bob Van Landuyt | 2017-06-26 | 2 | -5/+7 |
| | | | | | | |||||
| * | | | | | More logging so we know we have the rename in redis | Bob Van Landuyt | 2017-06-26 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | Revert renames from a migration | Bob Van Landuyt | 2017-06-26 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Revert namespace renames | Bob Van Landuyt | 2017-06-26 | 2 | -1/+23 |
| | | | | | | |||||
| * | | | | | Add methods to revert project renames | Bob Van Landuyt | 2017-06-26 | 2 | -6/+49 |
| | | | | | | |||||
| * | | | | | Track all renames in redis | Bob Van Landuyt | 2017-06-26 | 3 | -0/+9 |
| | | | | | | |||||
* | | | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master' | Douwe Maan | 2017-06-29 | 2 | -2/+4 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactors Project#search namespace join Closes #30708 See merge request !12091 | ||||
| * | | | | | Fix current feature related specs | Tiago Botelho | 2017-06-28 | 2 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'gitaly-encodings' into 'master' | Robert Speicher | 2017-06-28 | 3 | -11/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitaly ref encoding bugs Closes #34156 See merge request !12522 | ||||
| * | | | | | | Fix gitaly ref encoding bugs | Jacob Vosmaer | 2017-06-28 | 3 | -11/+20 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dm-dependency-linker-newlines' into 'master' | Robert Speicher | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package names Closes #34321 See merge request !12495 | ||||
| * | | | | | Fix diff of requirements.txt file by not matching newlines as part of ↵dm-dependency-linker-newlines | Douwe Maan | 2017-06-27 | 1 | -1/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | package names | ||||
* | | | | | Merge branch 'bvl-fix-ldap-login' into 'master' | Douwe Maan | 2017-06-28 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Fix setting `last_credential_check_at` on LDAP-login See merge request !12507 | ||||
| * | | | | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-login | Bob Van Landuyt | 2017-06-28 | 1 | -1/+1 |
| | | | | |