summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Fix scroll flicker34407-flickering-scroll-v1Eric Eastwood2017-06-281-3/+5
* | | | | | | | | Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'Robert Speicher2017-06-295-22/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Defer project destroys within a namespace in Groups::DestroyService#async_exe...Stan Hu2017-06-295-22/+54
* | | | | | | | | | Merge branch 'issueable-list-cleanup' into 'master'Annabel Dunstone Gray2017-06-298-74/+145
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Clean up issuable listsTaurie Davis2017-06-298-74/+145
|/ / / / / / / / /
* | | | | | | | | Merge branch '33443_supplement_traditional_chinese_in_taiwan_translation' int...Douwe Maan2017-06-292-86/+883
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | rebase to master黄涛2017-06-290-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | optimize translation content based on comments黄涛2017-06-291-20/+20
| | * | | | | | | | supplement traditional chinese in taiwan translation黄涛2017-06-282-86/+883
| * | | | | | | | | optimize translation content based on comments黄涛2017-06-291-20/+20
| * | | | | | | | | supplement traditional chinese in taiwan translation黄涛2017-06-292-86/+883
* | | | | | | | | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-298-33/+241
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Rename flipper_group to feature_group34078-allow-to-enable-feature-flags-with-more-granularityRémy Coutable2017-06-283-12/+12
| * | | | | | | | | Add MR iid in CHANGELOG entryRémy Coutable2017-06-281-1/+1
| * | | | | | | | | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-276-16/+24
| * | | | | | | | | Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-278-33/+233
* | | | | | | | | | Merge branch '34403-issue-dropdown-persists-when-adding-issue-number-to-issue...Phil Hughes2017-06-294-1/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Issue dropdown persists when adding issue number to issue description"Tim Zallmann2017-06-294-1/+22
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master'Rémy Coutable2017-06-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Run mysql tests on stable preperation branches like 9-3-stable-patch-2jej/run-mysql-tests-on-stable-preparation-branchesJames Edwards-Jones2017-06-291-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-296-0/+149
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added code for defining SHA attributesYorick Peterse2017-06-296-0/+149
* | | | | | | | | | | Merge branch 'refactor-namespace-default-scope-override' into 'master'Douwe Maan2017-06-292-3/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-overrideTiago Botelho2017-06-292-3/+11
* | | | | | | | | | | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-295-52/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-295-52/+4
* | | | | | | | | | | | Merge branch '33961-blank-section' into 'master'Phil Hughes2017-06-291-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move verification to block level instead of paragraphFilipa Lacerda2017-06-291-1/+12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-295-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-275-2/+19
* | | | | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-06-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update README.md to reflect where "Secret variables" are locatedSean2017-06-281-3/+3
* | | | | | | | | | | | | | Merge branch 'sidebar-header-no-conflicts' into 'master'Phil Hughes2017-06-295-1/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Minor editssidebar-header-no-conflictsAnnabel Dunstone Gray2017-06-293-4/+3
| * | | | | | | | | | | | | | Make header into links; CSS tweaksAnnabel Dunstone Gray2017-06-285-8/+14
| * | | | | | | | | | | | | | Add context header to sidebarAnnabel Dunstone Gray2017-06-285-1/+43
* | | | | | | | | | | | | | | Merge branch '26125-match-username-on-search' into 'master'Douwe Maan2017-06-293-26/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Inserts exact matches of username, email and name to the top of the user sear...26125-match-username-on-searchTiago Botelho2017-06-293-26/+47
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'Douwe Maan2017-06-294-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix errors caused by attempts to report already blocked or deleted usersHoracio Bertorello2017-06-284-2/+43
* | | | | | | | | | | | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-2952-971/+2285
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add some extremely rough documentationhttp://jneen.net/2017-06-271-0/+116
| * | | | | | | | | | | | | | | | use subject scope in :id/usershttp://jneen.net/2017-06-271-1/+3
| * | | | | | | | | | | | | | | | convert the special-case Ability methods to use policieshttp://jneen.net/2017-06-271-34/+10
| * | | | | | | | | | | | | | | | convert all the policies to DeclarativePolicyhttp://jneen.net/2017-06-2730-662/+629
| * | | | | | | | | | | | | | | | implement Presenter::Base#declarative_policy_delegatehttp://jneen.net/2017-06-271-0/+5
| * | | | | | | | | | | | | | | | update the specs to not require a set to be returnedhttp://jneen.net/2017-06-2712-275/+303
| * | | | | | | | | | | | | | | | add a new DeclarativePolicy frameworkhttp://jneen.net/2017-06-279-0/+1220
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-...Douwe Maan2017-06-294-1/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make membership required for create_user_by_membershipShinya Maeda2017-06-281-3/+3