summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'related-mr-labels' into 'master' Annabel Dunstone Gray2016-11-161-5/+11
|\
| * Added colored labels to related MR list.Didem Acet2016-11-161-5/+11
* | Merge branch 'issue-boards-counter-border-fix' into 'master' Fatih Acet2016-11-161-1/+1
|\ \
| * | Fixed issue boards counter border when unauthorizedissue-boards-counter-border-fixPhil Hughes2016-11-161-1/+1
| |/
* | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-161-2/+3
|\ \ | |/ |/|
| * Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-161-2/+3
* | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-151-1/+19
|\ \
| * | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-151-1/+19
* | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+2
|\ \ \
| * | | Add button to delete all merged branchesToon Claes2016-11-091-0/+2
* | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-1/+1
|\ \ \ \
| * | | | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'issue-boards-signed-out-state' into 'master' 24457-cannot-delete-labelsFatih Acet2016-11-145-5/+5
|\ \ \ \
| * | | | Fixed issue boards when not logged inissue-boards-signed-out-statePhil Hughes2016-11-145-5/+5
| |/ / /
* | | | Merge branch 'always-show-download-button' into 'master' Annabel Dunstone Gray2016-11-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Project download buttons always showPhilip Karpiak2016-11-101-1/+1
* | | | Merge branch 'issue_20245' into 'master' Robert Speicher2016-11-141-1/+2
|\ \ \ \
| * | | | Fix project Visibility level selector not using default valuesissue_20245Felipe Artur2016-11-101-1/+2
* | | | | Merge branch '22307-pipeline-link-in-builds-view' into 'master' Kamil Trzciński2016-11-135-6/+31
|\ \ \ \ \
| * | | | | remove unused class name22307-pipeline-link-in-builds-viewMike Greiling2016-11-102-2/+2
| * | | | | only display link to pipeline in generic build index, not on pipeline showMike Greiling2016-11-105-20/+22
| * | | | | update generic commit status to correspond with build status templateMike Greiling2016-11-101-0/+9
| * | | | | add missing column header for pipeline builds viewMike Greiling2016-11-102-3/+4
| * | | | | add pipeline column within builds indexMike Greiling2016-11-102-0/+10
| * | | | | add link to build's pipeline within build page headerMike Greiling2016-11-101-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'vue2' into 'master' Fatih Acet2016-11-1113-183/+148
|\ \ \ \ \
| * | | | | Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-103-26/+1
| * | | | | Fixed up resolve discussionsPhil Hughes2016-11-102-10/+11
| * | | | | Refactor of issue boards to work with Vue2Phil Hughes2016-11-107-152/+134
| * | | | | VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-101-1/+10
| * | | | | VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
* | | | | | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-112-4/+5
|\ \ \ \ \ \
| * | | | | | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-092-4/+5
* | | | | | | Merge branch '21764-build-page-title' into 'master' Fatih Acet2016-11-113-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Removed soon-to-be un-needed project title additions from builds and environm...21764-build-page-titleLuke Bennett2016-11-093-3/+1
* | | | | | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Make toggle pipeline btn into button elementAnnabel Dunstone Gray2016-11-101-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix cache for commit status in commits list to respect branchesLin Jen-Shin2016-11-101-1/+1
| |/ / / / /
* | | | | | Use 'Forking in progress' title when appropriatePhilip Karpiak2016-11-091-1/+1
|/ / / / /
* | | | | Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-091-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-2/+2
* | | | | Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' Fatih Acet2016-11-081-17/+11
|\ \ \ \ \
| * | | | | Removed inline JS and added new affix declarationLuke Bennett2016-11-041-17/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'upgrade-timeago' into 'master' Fatih Acet2016-11-084-3/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Replace jQuery.timeago with timeago.jsClement Ho2016-11-074-3/+6
| | |_|/ | |/| |
* | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-081-7/+14
|\ \ \ \
| * | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-071-7/+14
| |/ / /
* | | | Fix bug of json request urlHiroyuki Sato2016-11-071-1/+1