summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move color-logic into HipchatService#HipchatService5571-hipchat-notifications-missing-colorsRémy Coutable2016-07-271-1/+5
* Little refactor, add specs, and a CHANGELOG entryRémy Coutable2016-07-263-9/+31
* HipChat notification color overridden by build statusDavid Eisner2016-07-261-3/+11
* Merge branch 'remove-branches-feature-spec-head-file' into 'master' Rémy Coutable2016-07-261-32/+0
|\
| * Remove spec/features/projects/branches_spec.rb HEAD fileremove-branches-feature-spec-head-fileDouglas Barbosa Alexandre2016-07-261-32/+0
* | Merge branch '20150-retry-button-on-build-page-displays-for-users-who-can-t-u...Rémy Coutable2016-07-263-5/+28
|\ \
| * | Ensure current user can retry a build before showing the 'Retry' buttonRémy Coutable2016-07-263-5/+28
* | | Merge branch 'add-sidekiq-request-store' into 'master' Yorick Peterse2016-07-263-0/+15
|\ \ \
| * | | Enable SIDEKIQ_REQUEST_STORE by defaultadd-sidekiq-request-storeStan Hu2016-07-251-1/+1
| * | | Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_S...Stan Hu2016-07-253-0/+15
| | |/ | |/|
* | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-07-261-1/+1
|\ \ \ | |_|/ |/| |
| * | Add missing escape at line endAurelio Jargas2016-07-221-1/+1
* | | Merge branch '20189-markdown-video-doesn-t-work-when-the-referenced-video-fil...Rémy Coutable2016-07-269-5/+53
|\ \ \
| * | | Ensure relative paths for video are rewritten as we do for images20189-markdown-video-doesn-t-work-when-the-referenced-video-file-is-in-same-repoRémy Coutable2016-07-269-5/+53
* | | | Fix CHANGELOGRémy Coutable2016-07-261-9/+6
|/ / /
* | | Merge branch 'mysql_drop_all_tables' into 'master' Rémy Coutable2016-07-262-0/+8
|\ \ \ | |_|/ |/| |
| * | Disable MySQL foreign key checks before dropping all tablesDrew Blessing2016-07-252-0/+8
* | | Merge branch 'es6-gitlab-sytanx-highlighting' into 'master' Douwe Maan2016-07-261-1/+2
|\ \ \
| * | | Added '*.js.es6 gitlab-language=javascript' to .gitattributesLuke Bennett2016-07-261-1/+2
| |/ /
* | | Merge branch 'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-reques...Douwe Maan2016-07-253-2/+6
|\ \ \
| * | | remove search_id for label dropdown filterScott Le2016-07-243-2/+3
* | | | Merge branch 'fix-ci-status-link-css' into 'master' Fatih Acet2016-07-252-0/+6
|\ \ \ \
| * | | | Fix CI status icon link underlineClement Ho2016-07-252-0/+6
|/ / / /
* | | | Merge branch 'ie-dropdown-search-field' into 'master' Fatih Acet2016-07-251-0/+1
|\ \ \ \
| * | | | Fixed dropdown search field height in ie11ie-dropdown-search-fieldPhil Hughes2016-07-111-0/+1
* | | | | Merge branch 'diff-email-css' into 'master' Fatih Acet2016-07-251-61/+19
|\ \ \ \ \
| * | | | | Changed tr to be direct descendantdiff-email-cssPhil Hughes2016-07-211-1/+1
| * | | | | Fixed padding on line contentPhil Hughes2016-07-201-6/+4
| * | | | | Changed CSS for emails to be mostly single class selectorsPhil Hughes2016-07-131-26/+15
| * | | | | Reduced diff email CSSPhil Hughes2016-07-121-48/+19
* | | | | | Merge branch 'new-branch-button-highlight' into 'master' Fatih Acet2016-07-253-1/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add green outline to New Branch button (!5447)winniehell2016-07-233-1/+11
* | | | | | Merge branch 'es6it' into 'master' Douwe Maan2016-07-253-0/+11
|\ \ \ \ \ \
| * | | | | | Add CHANGELOGJacob Schatz2016-07-251-0/+1
| * | | | | | Add es6 gemJacob Schatz2016-07-252-0/+10
* | | | | | | Update CHANGELOG after 8.10.120246-devise-warning-user_omniauth_authorize_path-github-is-deprecated-please-use-user_github_omniauth_authorize_path-insteadRémy Coutable2016-07-251-9/+12
* | | | | | | Merge branch 'fix-backup-restore' into 'master' Rémy Coutable2016-07-252-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix backup restorefix-backup-restoreStan Hu2016-07-252-2/+3
* | | | | | | Merge branch 'instrument-nokogiri' into 'master' Rémy Coutable2016-07-252-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Instrument Nokogiri parsing methodsYorick Peterse2016-07-252-0/+8
|/ / / / / /
* | | | | | Merge branch 'use-project-id-in-repo-cache' into 'master' Yorick Peterse2016-07-254-10/+15
|\ \ \ \ \ \
| * | | | | | Use project ID in repository cache to prevent stale data from persisting acro...Stan Hu2016-07-254-10/+15
* | | | | | | Merge branch 'api-mr-doc' into 'master' Rémy Coutable2016-07-251-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Add iid to MR API responseRobert Schilling2016-07-251-0/+4
| |/ / / / / /
* | | | | | | Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-2510-17/+207
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-22283-2540/+4343
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-226-21/+70
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-2299-1496/+1082
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-21172-983/+2779
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cetiagonbotelho2016-07-2053-132/+470
| | |\ \ \ \ \ \ \ \ \