summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rails5_fix_db_reset' into 'rails5'rails5Valery Sizov2017-10-09795-808/+848
|\
| * [Rails 5] Fix ActiveRecord version deprecationsrails5_fix_db_resetVitaliy @blackst0ne Klachkov2017-10-08795-803/+803
| * [Rails 5] Fix db/migrate/20170707183807_add_group_id_to_milestones.rbVitaliy @blackst0ne Klachkov2017-10-081-5/+20
| * [Rails 5] Fix db/migrate/20170913131410_environments_project_id_not_null.rbVitaliy @blackst0ne Klachkov2017-10-081-0/+25
|/
* [Rails 5] Fix db/migrate/20170707183807_add_group_id_to_milestones.rbVitaliy @blackst0ne Klachkov2017-10-071-0/+5
* Merge branch 'rails5_fix_link_to_member_avatar' into 'rails5'Valery Sizov2017-10-051-1/+1
|\
| * [rails 5] Fix link_to_member_avatarrails5_fix_link_to_member_avatarVitaliy @blackst0ne Klachkov2017-10-051-1/+1
* | Merge branch 'rails5_fix_project_routing_spec' into 'rails5'Valery Sizov2017-10-051-8/+12
|\ \ | |/ |/|
| * [rails 5] Fix spec/routing/project_routing_spec.rbrails5_fix_project_routing_specVitaliy @blackst0ne Klachkov2017-10-051-8/+12
|/
* [Rails 5] Fix spec/workers/post_receive_spec.rb:84Valery Sizov2017-10-031-0/+3
* [Rails 5] Fix Ci::CreatePipelineServiceValery Sizov2017-10-031-8/+0
* [Rails 5][ci skip] Fix spec/lib/gitlab/database/rename_reserved_paths_migrati...Valery Sizov2017-10-031-0/+1
* Fix Pipeline's config_source enum.Valery Sizov2017-10-021-0/+4
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into rails5Valery Sizov2017-10-021029-7342/+15944
|\
| * Merge branch 'gitaly-0.43.0' into 'master'Sean McGivern2017-10-021-1/+1
| |\
| | * Use Gitaly 0.43.0Jacob Vosmaer2017-10-021-1/+1
| * | Merge branch '38619-fix-comment-delete-confirm-text' into 'master'Filipa Lacerda2017-10-022-1/+6
| |\ \
| | * | Fix comment deletion confirmation dialog typoMark Fletcher2017-10-022-1/+6
| * | | Merge branch 'fix-gitlay-typo' into 'master'Douwe Maan2017-10-021-1/+1
| |\ \ \
| | * | | Fix 'gitlay' typo in specJacob Vosmaer2017-10-021-1/+1
| * | | | Merge branch 'translation-timeago-a-while-ago' into 'master'Douwe Maan2017-10-022-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix translation for 'in a while'translation-timeago-a-while-agoKim "BKC" Carlbäcker2017-09-222-3/+3
| * | | | Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-022-1/+6
| |\ \ \ \
| | * | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-292-1/+6
| * | | | | Merge branch 'Update-description-accept-mr' into 'master'Sean McGivern2017-10-021-0/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Update CONTRIBUTING.mdUpdate-description-accept-mrVictor Wu2017-09-291-0/+4
| * | | | | Merge branch 'docs/add-changelog-lint' into 'master'Sean McGivern2017-10-021-0/+1
| |\ \ \ \ \
| | * | | | | Add changelog lint script to docs lint CI jobAchilleas Pipinellis2017-10-021-0/+1
| * | | | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-0210-62/+231
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-304-32/+152
| | * | | | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-304-3/+48
| | * | | | | Add a factory for `Gitaly::GitCommit`sAlejandro Rodríguez2017-09-303-27/+31
| | | |/ / / | | |/| | |
| * | | | | Merge branch '34371-ca-vue' into 'master'Phil Hughes2017-10-027-35/+55
| |\ \ \ \ \
| | * | | | | Remove global componentsFilipa Lacerda2017-10-027-35/+55
| |/ / / / /
| * | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-023-3/+32
| |\ \ \ \ \
| | * | | | | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-reportRémy Coutable2017-09-293-3/+32
| * | | | | | Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-stat...Tim Zallmann2017-10-029-70/+173
| |\ \ \ \ \ \
| | * | | | | | use LazyImageTagHelper.placeholder_image for blank src base64 image34366-issue-sidebar-don-t-render-participants-in-collapsed-stateLuke "Jared" Bennett2017-10-011-1/+1
| | * | | | | | Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-r...Luke "Jared" Bennett2017-09-28340-2007/+2934
| | |\ \ \ \ \ \
| | * | | | | | | Added changelogLuke "Jared" Bennett2017-09-281-0/+5
| | * | | | | | | Only trigger loadCheck on open toggle, not close. Update specs and add right_...Luke "Jared" Bennett2017-09-284-65/+104
| | * | | | | | | issuable_context_spec review changesLuke "Jared" Bennett2017-09-281-5/+5
| | * | | | | | | Finish issuable_context_specLuke "Jared" Bennett2017-09-281-10/+7
| | * | | | | | | Add issauble_context_specLuke "Jared" Bennett2017-09-281-0/+31
| | * | | | | | | Finish _participants view specLuke "Jared" Bennett2017-09-281-22/+7
| | * | | | | | | Update projects_helper_specLuke "Jared" Bennett2017-09-281-2/+2
| | * | | | | | | Add participants specLuke "Jared" Bennett2017-09-281-0/+41
| | * | | | | | | Conditionally call loadCheck if lazyLoader is presentLuke "Jared" Bennett2017-09-282-3/+2
| | * | | | | | | Trigger load of lazy images when opening sidebar, or clicking 'more participa...Luke "Jared" Bennett2017-09-282-2/+7
| | * | | | | | | Add lazy_load option to participant avatar helperLuke "Jared" Bennett2017-09-282-3/+6
View Lorry Controller Status