summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-315-51/+64
* Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-304-11/+6
|\
| * Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-301-5/+2
| * Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-303-6/+4
* | 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
* | | Avoid crash when trying to parse string with invalid UTF-8 sequenceBob Van Landuyt2017-05-301-0/+5
* | | Merge branch '25373-jira-links' into 'master'Rémy Coutable2017-05-301-3/+12
|\ \ \
| * | | Don’t create comment on JIRA if link already existsJarka Kadlecova2017-05-301-3/+12
* | | | Merge branch 'back-port-locked-milestones-to-ce' into 'master'Phil Hughes2017-05-309-41/+85
|\ \ \ \
| * | | | Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ceEric Eastwood2017-05-269-41/+85
* | | | | 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-306-4/+20
|\ \ \ \ \
| * | | | | '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-306-4/+20
* | | | | | Fix math rendering on blob pagesSean McGivern2017-05-301-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-05-306-43/+60
|\ \ \ \ \
| * | | | | Added specs for handleNotifications in mr_widget_options_spec.jsLuke "Jared" Bennett2017-05-263-4/+10
| * | | | | 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-265-43/+52
| | |_|/ / | |/| | |
* | | | | Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-302-5/+28
|\ \ \ \ \
| * | | | | Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-292-11/+28
| * | | | | Sanity check pipeline sha before saving merge request head pipelineFelipe Artur2017-05-231-2/+8
* | | | | | Update looks job logFilipa Lacerda2017-05-308-344/+295
* | | | | | Merge branch '31349-pipeline-url-techdeb' into 'master'Phil Hughes2017-05-303-57/+66
|\ \ \ \ \ \
| * | | | | | Use vue file for pipelines tables components31349-pipeline-url-techdebFilipa Lacerda2017-05-293-57/+66
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' i...Phil Hughes2017-05-305-7/+46
|\ \ \ \ \ \
| * | | | | | Backport MR from EEClement Ho2017-05-266-8/+47
* | | | | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-307-70/+110
|\ \ \ \ \ \ \
| * | | | | | | Use function to define data instead of an object31849-pipeline-show-view-realtimeFilipa Lacerda2017-05-262-4/+6
| * | | | | | | Creates a mediator for pipeline details vue in order to mount several vue app...Filipa Lacerda2017-05-267-70/+108
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-301-0/+5
|\ \ \ \ \ \ \
| * | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-291-0/+5
* | | | | | | | Merge branch '32954-loading-icon' into 'master'Phil Hughes2017-05-302-0/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Displays loading icon in async buttons inline32954-loading-iconFilipa Lacerda2017-05-262-0/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-292-8/+5
|\ \ \ \ \ \ \
| * | | | | | | Use if pipeline_schedule.refShinya Maeda2017-05-291-1/+1
| * | | | | | | Use nil? for ref evaluationShinya Maeda2017-05-291-1/+1
| * | | | | | | Validate parameters when active is falseShinya Maeda2017-05-291-7/+3
| * | | | | | | FixedShinya Maeda2017-05-291-1/+2
| * | | | | | | Revert "Reproduced"Shinya Maeda2017-05-291-2/+1
| * | | | | | | ReproducedShinya Maeda2017-05-291-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-293-44/+68
|\ \ \ \ \ \ \
| * | | | | | | Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissionsValery Sizov2017-05-293-21/+32
| * | | | | | | Explicitly test that guest is able to search through the wikiValery Sizov2017-05-292-1/+7
| * | | | | | | Fix: Wiki is not searchable with Guest permissionsValery Sizov2017-05-222-36/+43
* | | | | | | | Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'Robert Speicher2017-05-291-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spacesStan Hu2017-05-291-0/+1
* | | | | | | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-299-157/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-174-8/+7