summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-171-5/+0
* Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-17240-1998/+3105
|\
| * Merge branch '18709-use-specific-git-cached-counters' into 'master' Yorick Peterse2016-06-172-3/+3
| |\
| | * Use Git cached counters on project show page18709-use-specific-git-cached-countersPaco Guzman2016-06-162-3/+3
| * | Merge branch 'rs-devise-emails' into 'master' Robert Speicher2016-06-178-18/+59
| |\ \
| | * | Center the header logo for all Devise emailsRobert Speicher2016-06-161-0/+4
| | * | 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 branch 'remove_jiraissue' into 'master' Robert Speicher2016-06-171-2/+0
| |\ \ \
| | * | | Remove JiraIssue model and replace references with ExternalIssueIlan Shamir2016-06-161-2/+0
| * | | | Merge branch 'add_autocomplete_for_labels' into 'master' Robert Speicher2016-06-173-0/+29
| |\ \ \ \
| | * | | | Updated CHANGELOG and template.add_autocomplete_for_labelsFatih Acet2016-06-141-2/+1
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplet...Fatih Acet2016-06-14686-6278/+9556
| | |\ \ \ \
| | * | | | | add gfm autocomplete for labelsArinde Eniola2016-05-033-0/+30
| * | | | | | Merge branch 'fix-project-find-with-namespace-order' into 'master' Robert Speicher2016-06-171-1/+17
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-orderYorick Peterse2016-06-161-1/+17
| * | | | | | 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-161-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Added source branch text to dropdown togglePhil Hughes2016-06-161-1/+1
| | |/ / / / / /
| * | | | | | | 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-161-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructorRémy Coutable2016-06-151-1/+1
| * | | | | | | | | | Merge branch 'mr-download-dropdown-alignment' into 'master' Jacob Schatz2016-06-161-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed alignment of download dropdownmr-download-dropdown-alignmentPhil Hughes2016-06-141-2/+2
| * | | | | | | | | | | 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-169-97/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdownAlfredo Sumaran2016-06-169-97/+111
| * | | | | | | | | | | | | | 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 '18521-tanuki-logo' into 'master' Jacob Schatz2016-06-163-16/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix indentation scss-lint errorsAnnabel Dunstone2016-06-161-2/+2
| | * | | | | | | | | | | | | | Lighten each logo path color instead of whiteAnnabel Dunstone2016-06-153-16/+32
| * | | | | | | | | | | | | | | Merge branch 'fix/status-of-pipeline-without-builds' into 'master' Rémy Coutable2016-06-164-69/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix/status-of-pipeline-without-buildsfix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-15162-1344/+2020
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Remove reduntant method for building pipeline buildsGrzegorz Bizon2016-06-153-9/+8
| | * | | | | | | | | | | | | | | | Improve creating builds by combining two loopsGrzegorz Bizon2016-06-151-20/+16
| | * | | | | | | | | | | | | | | | Add note for short circuit eval when building buildsGrzegorz Bizon2016-06-151-2/+12
| | * | | | | | | | | | | | | | | | Return false in create_builds if not builds createdGrzegorz Bizon2016-06-151-3/+2
| | * | | | | | | | | | | | | | | | Improve code clarity in pipeline create serviceGrzegorz Bizon2016-06-142-15/+39
| | * | | | | | | | | | | | | | | | Merge branch 'master' into fix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-14289-2303/+4402
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Refactor code reponsible for creating buildsGrzegorz Bizon2016-06-034-10/+17
| | * | | | | | | | | | | | | | | | Update CreateCommitBuildsService to pass testsKamil Trzcinski2016-06-032-18/+20