Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix broken ajax for large repository trees (regression caused in !7208)24652-fix-timeago-not-rendering-in-repository-view | Mike Greiling | 2016-11-18 | 1 | -2/+2 |
* | Merge branch 'fix-tests-for-different-host' into 'master' | Rémy Coutable | 2016-11-18 | 11 | -16/+17 |
|\ | |||||
| * | Use `Gitlab.config.gitlab.host` over `'localhost'`fix-tests-for-different-host | Lin Jen-Shin | 2016-11-18 | 11 | -16/+17 |
* | | Merge branch 'autocomplete-find-user-improv' into 'master' | Rémy Coutable | 2016-11-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | Improved Ruby code in autocomplete user search | Phil Hughes | 2016-11-18 | 1 | -1/+1 |
* | | | Merge branch 'rs-empty-todo-messages' into 'master' | Alfredo Sumaran | 2016-11-18 | 1 | -7/+5 |
|\ \ \ | |||||
| * | | | Improve consistency of empty todo list messages | Robert Speicher | 2016-11-18 | 1 | -7/+5 |
* | | | | Merge branch 'bugfix/html-only-mail' into 'master' | Douwe Maan | 2016-11-18 | 7 | -6/+199 |
|\ \ \ \ | |||||
| * | | | | add a CHANGELOG entrybugfix/html-only-mail | http://jneen.net/ | 2016-11-18 | 1 | -0/+4 |
| * | | | | fix indentation for rubocop | http://jneen.net/ | 2016-11-17 | 1 | -3/+3 |
| * | | | | rename `part` variable and guard against nil content_type | http://jneen.net/ | 2016-11-17 | 1 | -7/+5 |
| * | | | | completely remove blockquote and table tags | http://jneen.net/ | 2016-11-17 | 1 | -2/+2 |
| * | | | | use Nokogiri::HTML.parse instead of capitalized method | http://jneen.net/ | 2016-11-17 | 1 | -1/+1 |
| * | | | | fix rubocop failures | http://jneen.net/ | 2016-11-17 | 2 | -2/+4 |
| * | | | | add parsing support for incoming html email | http://jneen.net/ | 2016-11-17 | 6 | -5/+194 |
* | | | | | Merge branch '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-... | Rémy Coutable | 2016-11-18 | 1 | -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-fail | Rémy Coutable | 2016-11-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'docs/no-artifacts-passing' into 'master' | Achilleas Pipinellis | 2016-11-18 | 1 | -0/+9 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Document how to prevent artifacts from passing to next stage | Achilleas Pipinellis | 2016-11-18 | 1 | -0/+9 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch '24617-skipped-icon-title' into 'master' | Fatih Acet | 2016-11-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove title from skipped status svg24617-skipped-icon-title | Annabel Dunstone Gray | 2016-11-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'jasperdenkers/gitlab-ce-ci-play-heroku-example' into 'master' | Achilleas Pipinellis | 2016-11-18 | 1 | -6/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Merge the two Scala examples | Achilleas Pipinellis | 2016-11-18 | 3 | -51/+35 |
| * | | | | | | Add Play/Scala CI example with deployment to Heroku | Jasper Denkers | 2016-11-18 | 2 | -0/+45 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch '23205-information-about-environments-build-page' into 'master' | Fatih Acet | 2016-11-18 | 9 | -12/+362 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix builds/show spec; use iid instead of id23205-information-about-environments-build-page | Annabel Dunstone Gray | 2016-11-17 | 3 | -6/+10 |
| * | | | | | | Fix tests and add has_environment? | Kamil Trzcinski | 2016-11-17 | 5 | -11/+45 |
| * | | | | | | Improve specs and add missing cases that were not supported | Kamil Trzcinski | 2016-11-17 | 7 | -22/+153 |
| * | | | | | | Finish specs for environment info | Annabel Dunstone Gray | 2016-11-09 | 2 | -17/+64 |
| * | | | | | | Refine specs for build show page with environments | Grzegorz Bizon | 2016-11-09 | 2 | -23/+39 |
| * | | | | | | First pass at tests | Annabel Dunstone Gray | 2016-11-09 | 2 | -7/+58 |
| * | | | | | | Expose `last_deployment` on `Ci::Builds` [ci skip] | Kamil Trzcinski | 2016-11-08 | 4 | -22/+47 |
| * | | | | | | Add switch statement & last_deployment method | Annabel Dunstone Gray | 2016-11-08 | 3 | -3/+31 |
| * | | | | | | Start adding environment info | Annabel Dunstone Gray | 2016-11-08 | 2 | -0/+14 |
* | | | | | | | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' | Sean McGivern | 2016-11-18 | 3 | -3/+36 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Pass correct tag target to post-receive hook when creating tag via UIpass-correct-tag-target-to-post-receive | Adam Niedzielski | 2016-11-18 | 3 | -3/+36 |
* | | | | | | | Merge branch 'fix/pipeline-id-metrics-migration' into 'master' | Douwe Maan | 2016-11-18 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix migration missing ignored transaction method | James Lopez | 2016-11-18 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'issue_13232' into 'master' | Sean McGivern | 2016-11-18 | 7 | -39/+189 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add JIRA remotelinks and prevent duplicated closing messages | Felipe Artur | 2016-11-18 | 7 | -39/+189 |
* | | | | | | | | | Merge branch 'fix-admin-ci-table' into 'master' | Annabel Dunstone Gray | 2016-11-18 | 3 | -1/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix misaligned buttons on admin builds page | Didem Acet | 2016-11-17 | 3 | -1/+11 |
* | | | | | | | | | Merge branch 'rs-project-archive-doc-fix' into 'master' | Achilleas Pipinellis | 2016-11-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Correct curl examples for archive and unarchive project API | Robert Speicher | 2016-11-18 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'feature/cycle-analytics-events' into 'master' | Douwe Maan | 2016-11-18 | 56 | -86/+1679 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | refactored updater and updated specs | James Lopez | 2016-11-18 | 9 | -60/+35 |
| * | | | | | | | | | fix small typo | James Lopez | 2016-11-18 | 1 | -1/+1 |
| * | | | | | | | | | added new build updater, specs and refactored allowed_ids | James Lopez | 2016-11-18 | 13 | -42/+107 |
| * | | | | | | | | | run pipeline worker in cycle analytics dev setup | James Lopez | 2016-11-18 | 2 | -1/+3 |
| * | | | | | | | | | refactor events | James Lopez | 2016-11-18 | 3 | -26/+12 |