summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix broken ajax for large repository trees (regression caused in !7208)24652-fix-timeago-not-rendering-in-repository-viewMike Greiling2016-11-181-2/+2
* Merge branch 'fix-tests-for-different-host' into 'master' Rémy Coutable2016-11-1811-16/+17
|\
| * Use `Gitlab.config.gitlab.host` over `'localhost'`fix-tests-for-different-hostLin Jen-Shin2016-11-1811-16/+17
* | Merge branch 'autocomplete-find-user-improv' into 'master' Rémy Coutable2016-11-181-1/+1
|\ \
| * | Improved Ruby code in autocomplete user searchPhil Hughes2016-11-181-1/+1
* | | Merge branch 'rs-empty-todo-messages' into 'master' Alfredo Sumaran2016-11-181-7/+5
|\ \ \
| * | | Improve consistency of empty todo list messagesRobert Speicher2016-11-181-7/+5
* | | | Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-187-6/+199
|\ \ \ \
| * | | | add a CHANGELOG entrybugfix/html-only-mailhttp://jneen.net/2016-11-181-0/+4
| * | | | fix indentation for rubocophttp://jneen.net/2016-11-171-3/+3
| * | | | rename `part` variable and guard against nil content_typehttp://jneen.net/2016-11-171-7/+5
| * | | | completely remove blockquote and table tagshttp://jneen.net/2016-11-171-2/+2
| * | | | use Nokogiri::HTML.parse instead of capitalized methodhttp://jneen.net/2016-11-171-1/+1
| * | | | fix rubocop failureshttp://jneen.net/2016-11-172-2/+4
| * | | | add parsing support for incoming html emailhttp://jneen.net/2016-11-176-5/+194
* | | | | Merge branch '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-...Rémy Coutable2016-11-181-1/+1
|\ \ \ \ \
| * | | | | Rely on Gitlab::Shell public API, not reading internal files it may use24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-failRémy Coutable2016-11-181-1/+1
* | | | | | Merge branch 'docs/no-artifacts-passing' into 'master' Achilleas Pipinellis2016-11-181-0/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Document how to prevent artifacts from passing to next stageAchilleas Pipinellis2016-11-181-0/+9
| | |_|/ / | |/| | |
* | | | | Merge branch '24617-skipped-icon-title' into 'master' Fatih Acet2016-11-181-1/+1
|\ \ \ \ \
| * | | | | Remove title from skipped status svg24617-skipped-icon-titleAnnabel Dunstone Gray2016-11-181-1/+1
* | | | | | Merge branch 'jasperdenkers/gitlab-ce-ci-play-heroku-example' into 'master' Achilleas Pipinellis2016-11-181-6/+35
|\ \ \ \ \ \
| * | | | | | Merge the two Scala examplesAchilleas Pipinellis2016-11-183-51/+35
| * | | | | | Add Play/Scala CI example with deployment to HerokuJasper Denkers2016-11-182-0/+45
| | |/ / / / | |/| | | |
* | | | | | Merge branch '23205-information-about-environments-build-page' into 'master' Fatih Acet2016-11-189-12/+362
|\ \ \ \ \ \
| * | | | | | Fix builds/show spec; use iid instead of id23205-information-about-environments-build-pageAnnabel Dunstone Gray2016-11-173-6/+10
| * | | | | | Fix tests and add has_environment?Kamil Trzcinski2016-11-175-11/+45
| * | | | | | Improve specs and add missing cases that were not supportedKamil Trzcinski2016-11-177-22/+153
| * | | | | | Finish specs for environment infoAnnabel Dunstone Gray2016-11-092-17/+64
| * | | | | | Refine specs for build show page with environmentsGrzegorz Bizon2016-11-092-23/+39
| * | | | | | First pass at testsAnnabel Dunstone Gray2016-11-092-7/+58
| * | | | | | Expose `last_deployment` on `Ci::Builds` [ci skip]Kamil Trzcinski2016-11-084-22/+47
| * | | | | | Add switch statement & last_deployment methodAnnabel Dunstone Gray2016-11-083-3/+31
| * | | | | | Start adding environment infoAnnabel Dunstone Gray2016-11-082-0/+14
* | | | | | | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' Sean McGivern2016-11-183-3/+36
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Pass correct tag target to post-receive hook when creating tag via UIpass-correct-tag-target-to-post-receiveAdam Niedzielski2016-11-183-3/+36
* | | | | | | Merge branch 'fix/pipeline-id-metrics-migration' into 'master' Douwe Maan2016-11-181-0/+2
|\ \ \ \ \ \ \
| * | | | | | | fix migration missing ignored transaction methodJames Lopez2016-11-181-0/+2
* | | | | | | | Merge branch 'issue_13232' into 'master' Sean McGivern2016-11-187-39/+189
|\ \ \ \ \ \ \ \
| * | | | | | | | Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-187-39/+189
* | | | | | | | | Merge branch 'fix-admin-ci-table' into 'master' Annabel Dunstone Gray2016-11-183-1/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix misaligned buttons on admin builds pageDidem Acet2016-11-173-1/+11
* | | | | | | | | Merge branch 'rs-project-archive-doc-fix' into 'master' Achilleas Pipinellis2016-11-181-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correct curl examples for archive and unarchive project APIRobert Speicher2016-11-181-2/+2
* | | | | | | | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-1856-86/+1679
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | refactored updater and updated specsJames Lopez2016-11-189-60/+35
| * | | | | | | | | fix small typoJames Lopez2016-11-181-1/+1
| * | | | | | | | | added new build updater, specs and refactored allowed_idsJames Lopez2016-11-1813-42/+107
| * | | | | | | | | run pipeline worker in cycle analytics dev setupJames Lopez2016-11-182-1/+3
| * | | | | | | | | refactor eventsJames Lopez2016-11-183-26/+12