summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fix specsrails_update_to_4_2Valery Sizov2015-11-307-9/+9
* fix notification_service specsValery Sizov2015-11-301-3/+2
* Migrate mailers to ActiveJobValery Sizov2015-11-265-29/+55
* Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-2610-78/+75
|\
| * Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-251-2/+1
| * Merge branch 'new-member-page' into 'master' Dmitriy Zaporozhets2015-11-259-76/+74
| |\
| | * Split group feature testsDmitriy Zaporozhets2015-11-252-2/+2
| | * Improve project members page UIDmitriy Zaporozhets2015-11-256-49/+36
| | * Improve UI for group members pageDmitriy Zaporozhets2015-11-255-32/+43
* | | Rails update to 4.2.4Valery Sizov2015-11-252-4/+3
|/ /
* | Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-251-0/+6
|\ \ | |/ |/|
| * Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-241-0/+6
* | Rescue StandardError, not Exceptionrs-rescue-standarderrorRobert Speicher2015-11-241-1/+1
* | Fix 500 error when update group member permissionDmitriy Zaporozhets2015-11-242-2/+2
* | Fix ultra-light color for small textfix-small-textDmitriy Zaporozhets2015-11-241-0/+6
|/
* Merge branch 'ci-artifacts-path' into 'master' Robert Speicher2015-11-232-4/+4
|\
| * Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-232-4/+4
* | Merge branch 'ci-fix-500' into 'master' Robert Speicher2015-11-233-0/+6
|\ \
| * | Fix 500 when using CIci-fix-500Kamil Trzcinski2015-11-233-0/+6
* | | Merge branch 'fix-clipboard-styling-in-create-mr' into 'master' Robert Speicher2015-11-231-0/+4
|\ \ \
| * | | Fix CSS styling for clipboard icon in new MR pageStan Hu2015-11-221-0/+4
| | |/ | |/|
* | | Merge branch 'issue_2296' into 'master' Douwe Maan2015-11-236-20/+74
|\ \ \ | |_|/ |/| |
| * | Fix bug that happened when replacing the Task list. #2296Rubén Dávila2015-11-201-1/+1
| * | Monkey patching TaskList::Item is no longer required. #2296Rubén Dávila2015-11-202-1/+4
| * | Refactor creation of system notes for Issue/MR labels. #2296Rubén Dávila2015-11-201-10/+7
| * | Generate system note after Task item has been updated on Issue or Merge Reque...Ruben Davila2015-11-196-12/+66
* | | Merge branch 'issue_2993' into 'master' Dmitriy Zaporozhets2015-11-232-2/+2
|\ \ \
| * | | Update copy used in alert message when deleting branches or tags. #2993issue_2993Rubén Dávila2015-11-192-2/+2
* | | | Merge branch 'issue-2831' into 'master' Douwe Maan2015-11-231-5/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix Assignee selector when 'Unassigned' #2831Jose Corcuera2015-11-201-5/+10
* | | | Merge branch 'award_fix' into 'master' Robert Speicher2015-11-222-2/+2
|\ \ \ \
| * | | | Emoji bug: Invalid url to imageaward_fixValery Sizov2015-11-222-2/+2
* | | | | Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher2015-11-222-0/+20
|\ \ \ \ \
| * | | | | Add upvote/downvote fields to merge request and note API to preserve compatib...fix-award-emoji-apiRobert Schilling2015-11-212-0/+20
* | | | | | Merge branch 'consistent-tags-api' into 'master' Stan Hu2015-11-213-5/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow editing a release in API via PUT methodRobert Schilling2015-11-212-1/+30
| * | | | | Only allow to create a release if it does not exist yetRobert Schilling2015-11-211-4/+10
| * | | | | API: Return 404 if the tag for a release does not existRobert Schilling2015-11-212-5/+30
* | | | | | Merge branch 'award_fix' into 'master' Robert Speicher2015-11-211-2/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Award: merge request fixValery Sizov2015-11-211-2/+5
| |/ / / /
* | | | | Merge branch 'issue_3598' into 'master' Robert Speicher2015-11-211-3/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove accidentally added line. #3598issue_3598Rubén Dávila2015-11-201-3/+0
| |/ / /
* | | | Merge branch 'fix-merge-requests-without-source-projects' into 'master' Dmitriy Zaporozhets2015-11-211-1/+1
|\ \ \ \
| * | | | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projectsYorick Peterse2015-11-201-1/+1
| |/ / /
* | | | Merge branch 'gitlab-ee-d39de0ea-backport' into 'master' Dmitriy Zaporozhets2015-11-211-5/+5
|\ \ \ \
| * | | | Port GitLab EE ProjectsFinder changesgitlab-ee-d39de0ea-backportYorick Peterse2015-11-201-5/+5
* | | | | Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets2015-11-211-27/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reduce method complexity in AutocompleteControlleree-flogDouwe Maan2015-11-201-27/+22
* | | | | Merge branch 'fix-scss-syntax-error' into 'master' Stan Hu2015-11-201-1/+1
|\ \ \ \ \
| * | | | | fix syntax error in common.scssGreg Smethells2015-11-201-1/+1
| | |/ / / | |/| | |