summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '27925-fix-mr-stray-pipelines-api-request' into 'master' Filipa Lacerda2017-02-155-8/+21
|\
| * Fix stray pipelines API request when showing MR27925-fix-mr-stray-pipelines-api-requestEric Eastwood2017-02-145-8/+21
* | Merge branch 'not_ignore_parameter_of_mr_change_branches_path' into 'master'Rémy Coutable2017-02-151-4/+4
|\ \
| * | Don't ignore the parameter of MergeRequestsHelper#mr_change_branches_pathDongqing Hu2017-02-141-4/+4
* | | Merge branch 'dz-nested-groups-improvements-3' into 'master' Dmitriy Zaporozhets2017-02-1514-30/+36
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/master' into dz-nested-groups-improvemen...dz-nested-groups-improvements-3Dmitriy Zaporozhets2017-02-142-6/+10
| |\ \
| * \ \ Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-1411-11/+47
| |\ \ \
| * | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-1412-27/+33
| * | | | Expose Namespace#full_path in namespaces APIDmitriy Zaporozhets2017-02-142-3/+3
* | | | | Merge branch '28142-overlap-bugs' into 'master' Alfredo Sumaran2017-02-142-1/+2
|\ \ \ \ \
| * | | | | Fix z index bugsAnnabel Dunstone Gray2017-02-142-1/+2
* | | | | | Merge branch 'master' into 'master' Clement Ho2017-02-141-7/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | #27631: Add missing top-area div to activity header pagenerro2017-02-141-7/+8
* | | | | | Merge branch 'issue_27317' into 'master' Alfredo Sumaran2017-02-141-1/+1
|\ \ \ \ \ \
| * | | | | | Fix timezone on issue boards due dateissue_27317Felipe Artur2017-02-141-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '26287-link-branch-in-calendar-activity' into 'master'Rémy Coutable2017-02-141-5/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add Links to Branches in Calendar ActivityJan Christophersen2017-02-141-5/+9
| |/ / / /
* | | | | Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'mast...Rémy Coutable2017-02-143-1/+16
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Execute web hooks for WikiPage delete operationMark Fletcher2017-02-142-1/+12
| * | | | Make WikiPage comparable according to StaticModel interfaceMark Fletcher2017-02-141-0/+4
* | | | | Merge branch '26286-most-recent-activity-profile-header' into 'master' Annabel Dunstone Gray2017-02-141-0/+2
|\ \ \ \ \
| * | | | | Add 'Most Recent Activity' header to the User Profile pageJan Christophersen2017-02-131-0/+2
* | | | | | Merge branch 'use-es6-promise-package' into 'master' Alfredo Sumaran2017-02-141-2/+1
|\ \ \ \ \ \
| * | | | | | Use es6-promise package to avoid webpack warningsuse-es6-promise-packageEric Eastwood2017-02-131-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '27932-merge-request-pipelines-displays-json' into 'master' Alfredo Sumaran2017-02-141-1/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1013-152/+49
| |\ \ \ \ \ \
| * | | | | | | Adds verification in case the endpoint already has `.json`Filipa Lacerda2017-02-101-2/+17
| * | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1023-70/+193
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-102-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1039-97/+141
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSONFilipa Lacerda2017-02-091-1/+1
* | | | | | | | | | | Merge branch '27924-set-max-width-mini-pipeline-text' into 'master' Filipa Lacerda2017-02-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Set max width for text in mini pipeline graph27924-set-max-width-mini-pipeline-textSam Rose2017-02-141-1/+1
* | | | | | | | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' Sean McGivern2017-02-143-6/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendarRémy Coutable2017-02-133-6/+9
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '27966-branch-ref-switcher-input-filter-broken' into 'master' Filipa Lacerda2017-02-141-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Display loading indicator when filtering ref switcher dropdownClement Ho2017-02-131-0/+2
* | | | | | | | | | | Add GFM support to nested groupsdz-nested-groups-gfm-altDmitriy Zaporozhets2017-02-133-3/+3
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-131-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make deploy key not show in User's keys listPawel Chojnacki2017-02-131-1/+6
* | | | | | | | | | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removalOswaldo Ferreira2017-02-131-1/+1
* | | | | | | | | | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-134-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove `try` from NotificationService#build_recipientsRichard Macklin2017-02-031-1/+1
| * | | | | | | | | | | | Refactor NotificationService#pipeline_finished to use skip_current_userRichard Macklin2017-02-031-2/+3
| * | | | | | | | | | | | Add checkbox in UI to opt into receiving notifications about your activityRichard Macklin2017-02-012-0/+6
| * | | | | | | | | | | | Update NotificationService to respect User#notified_of_own_activityRichard Macklin2017-02-011-3/+3
| * | | | | | | | | | | | Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-011-1/+1
* | | | | | | | | | | | | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' Rémy Coutable2017-02-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Show mentioned/issues being closed from a Merge Requests titleJan Christophersen2017-02-131-2/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
View Lorry Controller Status