summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add endpoints for award emoji on notesapi-endpoints-award-emojiZ.J. van de Weg2016-06-174-73/+340
* Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-175-34/+40
* Add endpoints for Award EmojiZ.J. van de Weg2016-06-175-1/+256
* Merge branch '18582-banzai-filter-external-link-filter' into 'master' Yorick Peterse2016-06-163-22/+26
|\
| * Banzai::Filter::ExternalLinkFilter use XPath18582-banzai-filter-external-link-filterPaco Guzman2016-06-163-22/+26
* | Merge branch 'gitlab_git-10.1.4' into 'master' Stan Hu2016-06-161-1/+1
|\ \
| * | Use gitlab_git 10.1.4Jacob Vosmaer2016-06-161-1/+1
| |/
* | Merge branch 'fix/status-of-pipeline-without-builds' into 'master' Rémy Coutable2016-06-169-73/+146
|\ \ | |/ |/|
| * Merge branch 'master' into fix/status-of-pipeline-without-buildsfix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-15290-2246/+6397
| |\
| * | Remove reduntant method for building pipeline buildsGrzegorz Bizon2016-06-155-9/+12
| * | Add Changelog entry for pipeline status fixGrzegorz Bizon2016-06-151-0/+1
| * | 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-152-3/+12
| * | Improve code clarity in pipeline create serviceGrzegorz Bizon2016-06-143-17/+41
| * | Remove ci commit specs that remain after bad mergeGrzegorz Bizon2016-06-141-403/+0
| * | Merge branch 'master' into fix/status-of-pipeline-without-buildsGrzegorz Bizon2016-06-14914-4415/+14121
| |\ \
| * | | Refactor code reponsible for creating buildsGrzegorz Bizon2016-06-037-25/+20
| * | | Fix specs for pipeline create for merge requestsGrzegorz Bizon2016-06-031-1/+4
| * | | Update specs describeKamil Trzcinski2016-06-031-1/+1
| * | | Update CreateCommitBuildsService to pass testsKamil Trzcinski2016-06-034-25/+27
| * | | Save Ci::Commit object to persist all created buildsKamil Trzcinski2016-06-036-6/+21
| * | | Do not create pipeline objects when no buildsGrzegorz Bizon2016-06-033-23/+34
| * | | Update ci commit pipeline specs according to changesGrzegorz Bizon2016-06-032-9/+9
| * | | Add minor improvements in create builds serviceGrzegorz Bizon2016-06-034-10/+8
| * | | Add specs covering case when there are no buildsGrzegorz Bizon2016-06-031-0/+18
| * | | Refactor ci commit pipeline to prevent implicit savesGrzegorz Bizon2016-06-034-27/+17
* | | | Merge branch '18591-banzai-filter-upload-link-filter' into 'master' Yorick Peterse2016-06-163-10/+22
|\ \ \ \
| * | | | Banzai::Filter::UploadLinkFilter use XPathPaco Guzman2016-06-163-10/+22
* | | | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-165-26/+5
|\ \ \ \ \
| * | | | | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-153-24/+3
| * | | | | Fix wrong partial path in JS viewRémy Coutable2016-06-152-2/+2
* | | | | | Merge branch 'group-owners-association' into 'master' Rémy Coutable2016-06-162-4/+18
|\ \ \ \ \ \
| * | | | | | Turn Group#owners into a has_many associationYorick Peterse2016-06-162-4/+18
* | | | | | | Merge branch 'fix-environments-db' into 'master' Valery Sizov2016-06-162-1/+22
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Make project_id nullableKamil Trzcinski2016-06-162-1/+22
|/ / / / / /
* | | | | | Merge branch 'fix_migration_style_guide' into 'master' Yorick Peterse2016-06-161-2/+14
|\ \ \ \ \ \
| * | | | | | Update migration_style_guide.md with new detailsfix_migration_style_guideDrew Blessing2016-06-151-2/+14
* | | | | | | Merge branch 'hide-todo-collapsed-sidebar' into 'master' Jacob Schatz2016-06-161-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Hide the Todo button in the collapsed issuable sidebar.hide-todo-collapsed-sidebarConnor Shea2016-06-151-0/+5
* | | | | | | | Merge branch 'long-commit-message-scroll-fix' into 'master' Jacob Schatz2016-06-162-0/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-mes...Fatih Acet2016-06-16353-2724/+15578
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Update CHANGELOG.long-commit-message-scroll-fixFatih Acet2016-06-141-0/+1
| * | | | | | | | | Fix long commit message scroll issue.Fatih Acet2016-06-141-0/+1
* | | | | | | | | | Merge branch 'category-search-dropdown' into 'master' Jacob Schatz2016-06-1610-22/+354
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-16367-2845/+15729
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-153-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | added whitespace toggle to diffs page and set it to return the project compar...Luke "Jared" Bennett2016-06-103-0/+8
* | | | | | | | | | | Merge branch 'award-emoji-fix' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix emoji block selector.award-emoji-fixFatih Acet2016-06-111-1/+1