summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/gb/stage-id-reference-background-migration' into backstage/...Grzegorz Bizon2017-07-051-2/+18
|\
| * Improve exception description in bg migrationsGrzegorz Bizon2017-07-031-1/+3
| * Add description to exception in bg migrations workerGrzegorz Bizon2017-06-301-1/+1
| * Use integers to schedule delayed background migrationsGrzegorz Bizon2017-06-291-2/+2
| * Use ActiveRecord 5 batching to schedule bg migrationGrzegorz Bizon2017-06-291-1/+1
| * Make it possible to schedule bg migrations in bulkGrzegorz Bizon2017-06-291-2/+16
* | Add a workaround for a tmp job -> stage relationGrzegorz Bizon2017-07-041-0/+9
* | Add some validations to persisted stage modelGrzegorz Bizon2017-07-042-8/+9
* | Use enumerated status in persisted stage classGrzegorz Bizon2017-07-042-0/+13
* | Only verifies top position after the request has finished to account for errorsFilipa Lacerda2017-06-301-5/+5
* | Merge branch 'dm-empty-state-new-merge-request' into 'master'Sean McGivern2017-06-301-3/+5
|\ \
| * | Fix 'New merge request' button for users who don't have push access to canoni...dm-empty-state-new-merge-requestDouwe Maan2017-06-291-3/+5
* | | Merge branch '34502-gitlab-git-hook-should-set-the-gl_repository-environment-...Dmitriy Zaporozhets2017-06-302-4/+4
|\ \ \
| * | | Set the GL_REPOSITORY env variable on Gitlab::Git::Hook34502-gitlab-git-hook-should-set-the-gl_repository-environment-variableAlejandro Rodríguez2017-06-292-4/+4
* | | | Merge branch 'inject-add-diff-note' into 'master'Phil Hughes2017-06-3010-152/+103
|\ \ \ \
| * | | | Render add-diff-note button with server.Bryce Johnson2017-06-2910-152/+103
* | | | | Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'Tim Zallmann2017-06-301-1/+3
|\ \ \ \ \
| * | | | | Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-291-0/+3
| * | | | | Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas2017-06-271-1/+0
* | | | | | Merge branch 'backport-license-issue-weights' into 'master'Douwe Maan2017-06-292-5/+19
|\ \ \ \ \ \
| * | | | | | Backport changes to Projects::IssuesController and the search barNick Thomas2017-06-292-5/+19
| | |/ / / / | |/| | | |
* | | | | | bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloadinghttp://jneen.net/2017-06-292-2/+2
| |_|/ / / |/| | | |
* | | | | Resolve "Select branch dropdown is too close to branch name"Tim Zallmann2017-06-292-18/+25
* | | | | Merge branch 'rs-silence-update-pages-service' into 'master'Rémy Coutable2017-06-291-1/+2
|\ \ \ \ \
| * | | | | Perform unzip quietly in UpdatePagesServicers-silence-update-pages-serviceRobert Speicher2017-06-281-1/+2
* | | | | | Merge branch 'new-nav-logo-safari-fix' into 'master'Annabel Dunstone Gray2017-06-291-3/+2
|\ \ \ \ \ \
| * | | | | | Fixed new navgiation bar logo height in SafariPhil Hughes2017-06-291-3/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '34407-flickering-scroll-v1' into 'master'Annabel Dunstone Gray2017-06-291-3/+5
|\ \ \ \ \ \
| * | | | | | Fix scroll flicker34407-flickering-scroll-v1Eric Eastwood2017-06-281-3/+5
* | | | | | | Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'Robert Speicher2017-06-292-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Defer project destroys within a namespace in Groups::DestroyService#async_exe...Stan Hu2017-06-292-2/+7
* | | | | | | | Clean up issuable listsTaurie Davis2017-06-295-72/+139
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into...Robert Speicher2017-06-292-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename FLippable to FeatureGate and make `flipper_group` and `user` mutually ...Rémy Coutable2017-06-272-2/+2
| * | | | | | Allow the feature flags to be enabled/disabled with more granularityRémy Coutable2017-06-272-0/+8
* | | | | | | Resolve "Issue dropdown persists when adding issue number to issue description"Tim Zallmann2017-06-293-1/+18
* | | | | | | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+18
|\ \ \ \ \ \ \
| * | | | | | | Added code for defining SHA attributesYorick Peterse2017-06-291-0/+18
* | | | | | | | Merge branch 'refactor-namespace-default-scope-override' into 'master'Douwe Maan2017-06-291-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove Namespace model default scope override and write additional test to Pr...refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-3/+1
* | | | | | | | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-293-27/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-293-27/+4
* | | | | | | | | 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-291-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-0/+5
* | | | | | | | | | 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-291-1/+10
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status