summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-172-6/+1
* Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-17418-3054/+16656
|\
| * Merge branch '18709-use-specific-git-cached-counters' into 'master' Yorick Peterse2016-06-173-3/+4
| |\
| | * Use Git cached counters on project show page18709-use-specific-git-cached-countersPaco Guzman2016-06-163-3/+4
| * | Merge branch 'rs-devise-emails' into 'master' Robert Speicher2016-06-1710-20/+81
| |\ \
| | * | Center the header logo for all Devise emailsRobert Speicher2016-06-162-0/+5
| | * | Add previews for all customized Devise emailsRobert Speicher2016-06-161-2/+21
| | * | Customize the Devise `unlock_instructions` emailRobert Speicher2016-06-162-10/+16
| | * | Customize the Devise `reset_password_instructions` emailRobert Speicher2016-06-163-8/+22
| | * | Customize the Devise `password_change` emailsRobert Speicher2016-06-162-0/+17
| * | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-161-0/+7
| |\ \ \
| | * \ \ Merge branch 'confidential-issue-notes' into 'master' Robert Speicher2016-06-161-0/+7
| | |\ \ \
| | | * | | Project members with guest role can't access notes on confidential issuesDouglas Barbosa Alexandre2016-06-141-0/+7
| * | | | | Update CHANGELOG for !4659Robert Speicher2016-06-161-1/+1
| * | | | | Merge branch 'remove_jiraissue' into 'master' Robert Speicher2016-06-177-39/+11
| |\ \ \ \ \
| | * | | | | Remove JiraIssue model and replace references with ExternalIssueIlan Shamir2016-06-167-39/+11
| * | | | | | Merge branch 'add_autocomplete_for_labels' into 'master' Robert Speicher2016-06-174-0/+30
| |\ \ \ \ \ \
| | * | | | | | Updated CHANGELOG and template.add_autocomplete_for_labelsFatih Acet2016-06-142-3/+2
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplet...Fatih Acet2016-06-141898-12371/+35104
| | |\ \ \ \ \ \
| | * | | | | | | add entry to CHANGELOGArinde Eniola2016-05-031-0/+1
| | * | | | | | | add gfm autocomplete for labelsArinde Eniola2016-05-033-0/+30
| * | | | | | | | Merge branch 'fix-project-find-with-namespace-order' into 'master' Robert Speicher2016-06-172-2/+34
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-orderYorick Peterse2016-06-162-2/+34
| * | | | | | | | | Merge branch 'bump-gitlab-git-10.2.0' into 'master' Robert Speicher2016-06-172-3/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Use gitlab-git 10.2.0bump-gitlab-git-10.2.0Stan Hu2016-06-162-3/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'banzai-issue-filter-queries' into 'master' Douwe Maan2016-06-165-7/+139
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reduce queries in IssueReferenceFilterbanzai-issue-filter-queriesYorick Peterse2016-06-165-7/+139
| * | | | | | | | | Merge branch 'tree-file-title' into 'master' Jacob Schatz2016-06-162-5/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Added title attribute to enties in tree viewtree-file-titlePhil Hughes2016-06-162-5/+6
| * | | | | | | | | | Merge branch 'merge-request-default-source-branch-text' into 'master' Jacob Schatz2016-06-162-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | CHANGELOGmerge-request-default-source-branch-textPhil Hughes2016-06-161-13/+1
| | * | | | | | | | | | CHANGELOGPhil Hughes2016-06-161-0/+1
| | * | | | | | | | | | Added source branch text to dropdown togglePhil Hughes2016-06-162-1/+13
| * | | | | | | | | | | Merge branch 'media-query-bug' into 'master' Jacob Schatz2016-06-161-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix project header alignment media query bugmedia-query-bugAnnabel Dunstone2016-06-151-3/+3
| * | | | | | | | | | | | Merge branch 'dz-fix-mr-widget-padding' into 'master' Jacob Schatz2016-06-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add bottom padding for merge request command line textdz-fix-mr-widget-paddingDmitriy Zaporozhets2016-06-151-1/+1
| * | | | | | | | | | | | | Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' int...Jacob Schatz2016-06-162-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructorRémy Coutable2016-06-152-2/+2
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'mr-download-dropdown-alignment' into 'master' Jacob Schatz2016-06-162-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed alignment of download dropdownmr-download-dropdown-alignmentPhil Hughes2016-06-142-2/+3
| * | | | | | | | | | | | | | Merge branch 'push-event-banner-container' into 'master' Jacob Schatz2016-06-162-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fixed last push event banner not being in containerpush-event-banner-containerPhil Hughes2016-06-142-11/+15
| * | | | | | | | | | | | | | | Merge branch 'diff-scroll-point' into 'master' Jacob Schatz2016-06-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed issue when opening a highlighted line diffdiff-scroll-pointPhil Hughes2016-06-101-1/+1
| * | | | | | | | | | | | | | | | Merge branch 'template_dropdown' into 'master' Jacob Schatz2016-06-1612-102/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdownAlfredo Sumaran2016-06-1612-102/+133
| * | | | | | | | | | | | | | | | | Merge branch 'build-scroll-controls-on-complete' into 'master' Jacob Schatz2016-06-161-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Shows build scroll buttons after build is completebuild-scroll-controls-on-completePhil Hughes2016-06-131-5/+5
| * | | | | | | | | | | | | | | | | Merge branch '18474-missing-images-on-confirmation-email' into 'master' Douwe Maan2016-06-162-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \