summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
* Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-303-16/+47
* Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-3013-63/+26
|\
| * Add changelog30410-revert-9347-and-10079Rémy Coutable2017-05-301-0/+5
| * Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-305-33/+9
| * Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-307-30/+12
* | Merge branch '30502-fix-bottom-padding-job-page' into 'master'Annabel Dunstone Gray2017-05-301-0/+4
|\ \
| * | Fix bottom padding for build page30502-fix-bottom-padding-job-pagekushalpandya2017-05-301-0/+4
* | | Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable2017-05-308-20/+295
|\ \ \
| * | | Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-308-20/+295
* | | | Merge branch 'bvl-fix-encoding-errors-when-validating-paths' into 'master'Douwe Maan2017-05-303-1/+28
|\ \ \ \
| * | | | Avoid crash when trying to parse string with invalid UTF-8 sequenceBob Van Landuyt2017-05-303-1/+28
|/ / / /
* | | | Merge branch '25373-jira-links' into 'master'Rémy Coutable2017-05-305-10/+61
|\ \ \ \
| * | | | Don’t create comment on JIRA if link already existsJarka Kadlecova2017-05-305-10/+61
| |/ / /
* | | | Merge branch 'back-port-locked-milestones-to-ce' into 'master'Phil Hughes2017-05-3010-41/+88
|\ \ \ \
| * | | | Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ceEric Eastwood2017-05-2610-41/+88
* | | | | Merge branch 'Disable-sub_group_issuables_spec-for-mysql' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \ \ \ \
| * | | | | Disable sub_group_issuables_spec.rb for mysqlLuke "Jared" Bennett2017-05-301-1/+1
* | | | | | Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \ \ \ \ \
| * | | | | | Make `ActiveRecord::Migrator` idempotent again in test envfix/gb/improve-active-record-test-extensionsGrzegorz Bizon2017-05-291-1/+1
* | | | | | | Merge branch 'winh-merge-request-tree-symbols' into 'master'Annabel Dunstone Gray2017-05-301-6/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix alignment of tree symbols in merge requestswinh-merge-request-tree-symbolswinh2017-05-291-6/+2
* | | | | | | Merge branch '19107-404-when-creating-new-milestone-or-issue-for-project-that...Douwe Maan2017-05-3011-50/+99
|\ \ \ \ \ \ \
| * | | | | | | 'New issue'/'New merge request' dropdowns should show only projects with issu...19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabledblackst0ne2017-05-3011-50/+99
* | | | | | | | Merge branch '33048-markdown-rendering-of-md-files-has-ceased-to-display-late...Douwe Maan2017-05-302-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix math rendering on blob pagesSean McGivern2017-05-302-1/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '33032-invalid-you-directly-addressed-yourself-todo-when-using-u...Grzegorz Bizon2017-05-303-3/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix /unsubscribe slash command creating extra todos33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribeSean McGivern2017-05-303-3/+32
* | | | | | | | Merge branch '32653-fix-gemfile-lock' into 'master'Grzegorz Bizon2017-05-301-4/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lockRémy Coutable2017-05-301-4/+3
| |/ / / / / /
* | | | | | | Merge branch 'node-sudo-bash' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use 'sudo bash' when adding nodesource repositoryJacob Vosmaer2017-05-231-1/+1
* | | | | | | | Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-05-308-43/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Add rubocop:disable to gon_helper.rb32916-browser-notifications-for-pipeline-running-in-a-mr-is-goneLuke "Jared" Bennett2017-05-261-0/+2
| * | | | | | | | Added specs for handleNotifications in mr_widget_options_spec.jsLuke "Jared" Bennett2017-05-264-4/+47
| * | | | | | | | Move gon ref to the index to avoid depending on gon in any mr widget objectsLuke "Jared" Bennett2017-05-262-1/+3
| * | | | | | | | Restore notifications to MR widgetLuke "Jared" Bennett2017-05-266-43/+53
* | | | | | | | | Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-305-7/+76
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-295-13/+61
| * | | | | | | | Sanity check pipeline sha before saving merge request head pipelineFelipe Artur2017-05-233-3/+24
* | | | | | | | | Merge branch '30117-update-looks-job-log' into 'master'Phil Hughes2017-05-3010-483/+480
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update looks job logFilipa Lacerda2017-05-3010-483/+480
|/ / / / / / / / /
* | | | | | | | | Merge branch '31349-pipeline-url-techdeb' into 'master'Phil Hughes2017-05-304-58/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use vue file for pipelines tables components31349-pipeline-url-techdebFilipa Lacerda2017-05-294-58/+67
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-authorized-members-destroy' into 'master'Rémy Coutable2017-05-301-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix spec for Members::AuthorizedDestroyServicefix-authorized-members-destroyYorick Peterse2017-05-301-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-05-307-7/+123
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix rubocop2472-assignee-dropdown-does-not-display-selected-assignee-ceClement Ho2017-05-261-3/+1
| * | | | | | | | | Backport MR from EEClement Ho2017-05-269-8/+140
* | | | | | | | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-3010-106/+144
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status