summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move some project/group members spinach tests to rspecdz-refactor-create-membersDmitriy Zaporozhets2017-04-176-194/+146
* Refactor members controller destroy actionDmitriy Zaporozhets2017-04-174-25/+30
* Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-177-30/+25
* Merge branch '27655-clear-emoji-search-after-selection' into 'master' Alfredo Sumaran2017-04-174-24/+67
|\
| * Clear emoji search in awards menu after picking emoji27655-clear-emoji-search-after-selectionEric Eastwood2017-04-134-24/+67
* | Merge branch 'sh-fix-base-parser' into 'master' Robert Speicher2017-04-162-3/+23
|\ \
| * | Fix regression in rendering Markdown references that do not existsh-fix-base-parserStan Hu2017-04-152-3/+23
* | | Merge branch '30492-using-icon-to-mark-discussion-as-resolved-does-not-resolv...Phil Hughes2017-04-151-4/+4
|\ \ \
| * | | Update ResolveBtn when CommentStore changes state30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussionSam Rose2017-04-131-4/+4
* | | | Merge branch 'issue-title-vue-sfc' into 'master' Phil Hughes2017-04-155-25/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | Issue Title Vue: convert to .vue - use 'render' with 'createElement' in indexRegis Boudinot2017-04-155-25/+24
|/ / /
* | | Merge branch 'sh-disable-cache-classes' into 'master' Robert Speicher2017-04-142-1/+8
|\ \ \
| * | | Turn on caching of classes in Knapsack specsStan Hu2017-04-142-1/+8
|/ / /
* | | Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master' Annabel Dunstone Gray2017-04-142-18/+35
|\ \ \
| * | | Fix note header timeago and action overlap30810-fix-note-header-info-and-action-overlapEric Eastwood2017-04-132-18/+35
* | | | Merge branch 'remove-double-newline-for-single-attachments' into 'master' Phil Hughes2017-04-143-5/+13
|\ \ \ \
| * | | | Only add newlines for multiple uploadsremove-double-newline-for-single-attachmentsLuke "Jared" Bennett2017-04-143-5/+13
* | | | | Merge branch 'add-cookie-expirations-to-callouts' into 'master' Phil Hughes2017-04-142-2/+2
|\ \ \ \ \
| * | | | | Add expirations to CA and user calloutsLuke "Jared" Bennett2017-04-142-2/+2
| |/ / / /
* | | | | Merge branch 'frontend_prevent_authored_awardable_votes' into 'master' Alfredo Sumaran2017-04-148-12/+100
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | frontend prevent authored votesbarthc2017-04-148-12/+100
* | | | | Merge branch 'use-hashie-forbidden_attributes' into 'master' Rémy Coutable2017-04-143-1/+11
|\ \ \ \ \
| * | | | | Use the hashie-forbideen_attributes gemandrew brown2017-04-093-1/+11
* | | | | | Merge branch 'revert-a0d734c9' into 'master' Stan Hu2017-04-141-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'grpc-1.2.2' into 'master'"revert-a0d734c9Lin Jen-Shin (godfat)2017-04-141-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-141-1/+1
|\ \ \ \ \ \
| * | | | | | Update show.html.haml to allow guests to see the Files tab as per https://git...AJ ONeal2017-04-121-1/+1
* | | | | | | Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-147-160/+176
|\ \ \ \ \ \ \
| * | | | | | | Refactor build_service_specGeorge Andrinopoulos2017-04-131-4/+2
| * | | | | | | Implement Users::BuildServicegeoandri2017-04-137-160/+178
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'patch-14' into 'master' Rémy Coutable2017-04-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Enable the import_url field. Rune Philosof2017-02-221-1/+1
* | | | | | | | Merge branch 'branch-versions' into 'master' Rémy Coutable2017-04-147-86/+67
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Expand components version specification format to allow branchesbranch-versionsAlejandro Rodríguez2017-04-137-86/+67
* | | | | | | | Merge branch 'sh-improve-logging-for-bad-creations' into 'master'Robert Speicher2017-04-142-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve error messages when a record is unable to be created for a projectStan Hu2017-04-132-0/+17
* | | | | | | | | Merge branch '30907-allow-to-enable-rspec-profile-for-a-given-branch' into 'm...Robert Speicher2017-04-131-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow to enable `rspec_profiling` for a branch on the CI30907-allow-to-enable-rspec-profile-for-a-given-branchRémy Coutable2017-04-131-2/+8
* | | | | | | | | | Merge branch 'issues-empty-state-not-centered' into 'master' Annabel Dunstone Gray2017-04-132-2/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Centered empty state for issuesJose Ivan Vargas2017-04-132-2/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pms-lighter-colors' into 'master' Annabel Dunstone Gray2017-04-132-13/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add lighter color variables. Fix active note color.pms-lighter-colorsPedro Moreira da Silva2017-04-132-13/+21
* | | | | | | | | | | Merge branch 'clear-instructions' into 'master' Yorick Peterse2017-04-131-8/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make instructions clearerclear-instructionsSid Sijbrandij2017-04-131-8/+5
* | | | | | | | | | | | Merge branch 'sh-add-icon-for-active-service-template' into 'master'Robert Speicher2017-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use an icon to indicate whether service template is activeStan Hu2017-04-131-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-132-13/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix appending state to issuable referencesfix-appending-state-to-issuable-referencesAdam Niedzielski2017-04-132-13/+34
* | | | | | | | | | | | Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-135-10/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update tests for the fact that we would skip one linefix-trace-seeking-readlineLin Jen-Shin2017-04-131-3/+3