summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Grape to master.cs-upgrade-grape-againConnor Shea2016-12-132-16/+21
* Of course fixing this just reveals another bug.Connor Shea2016-12-131-1/+1
* Upgrade grape from 0.15.0 to 0.18.0.Connor Shea2016-12-135-11/+14
* Merge branch '20052-actions-table-vscroll' into 'master' Annabel Dunstone Gray2016-12-133-13/+16
|\
| * Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscrollFilipa Lacerda2016-12-133-13/+16
* | Merge branch 'backport/group-policies' into 'master' Rémy Coutable2016-12-132-0/+12
|\ \
| * | Backport hooks on group policies for the EE-specific implementationbackport/group-policiesDouglas Barbosa Alexandre2016-12-132-0/+12
* | | Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-134-1/+148
|\ \ \
| * | | Make rubocop happyapi-cherry-pickRobert Schilling2016-12-131-1/+1
| * | | API: Ability to cherry-pick a commitRobert Schilling2016-12-134-1/+148
* | | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable2016-12-133-2/+7
|\ \ \ \
| * | | | For single line git commit messages, the close quote should be on the same li...jzinn/gitlab-ce-chomp-git-status-messageJulian Zinn2016-12-133-2/+7
| | |_|/ | |/| |
* | | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-137-113/+149
|\ \ \ \
| * | | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-135-32/+15
| * | | | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-125-96/+149
* | | | | Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable2016-12-133-57/+25
|\ \ \ \ \
| * | | | | Move admin settings spinach feature to rspecjurre2016-12-133-57/+25
* | | | | | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-134-9/+32
|\ \ \ \ \ \
| * | | | | | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-134-9/+32
* | | | | | | Merge branch 'dz-create-routes-lower-index' into 'master' Dmitriy Zaporozhets2016-12-133-1/+27
|\ \ \ \ \ \ \
| * | | | | | | Add AddLowerPathIndexToRoutes to setup_postgresql.rakeDmitriy Zaporozhets2016-12-131-0/+4
| * | | | | | | Add index to routes table on lower path for postgresqldz-create-routes-lower-indexDmitriy Zaporozhets2016-12-122-1/+23
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'allow-more-filenames' into 'master' Rémy Coutable2016-12-133-2/+50
|\ \ \ \ \ \ \
| * | | | | | | Allow all alphanumeric characters in file names (!8002)winniehell2016-12-132-2/+6
| * | | | | | | Add failing test for #20190winniehell2016-12-131-0/+44
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '25518-uniquely-style-labels' into 'master' Fatih Acet2016-12-133-1/+4
|\ \ \ \ \ \ \
| * | | | | | | added border-radius and padding to labels25518-uniquely-style-labelsDimitrie Hoekstra2016-12-133-1/+4
* | | | | | | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-135-9/+25
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-113-9/+9
| * | | | | | | Create nested group factoryDmitriy Zaporozhets2016-12-112-0/+11
| * | | | | | | Validate presence of route by Routable concernDmitriy Zaporozhets2016-12-112-0/+5
* | | | | | | | Merge branch '3478-copy-commit-hash-to-clipboard' into 'master' Sean McGivern2016-12-135-17/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix test3478-copy-commit-hash-to-clipboardVictor Wu2016-12-121-1/+1
| * | | | | | | | Tweak style and add back wordingvictorwu2016-12-121-1/+2
| * | | | | | | | Clean up commit copy to clipboard and make consistentvictorwu2016-12-124-15/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-dif...Fatih Acet2016-12-134-4/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-imageLuke "Jared" Bennett2016-12-044-4/+11
* | | | | | | | | Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-133-1/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow to delete tag release noteissue_13270Felipe Artur2016-12-123-1/+67
* | | | | | | | | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' Sean McGivern2016-12-132-2/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-132-2/+18
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-autoloading-issue' into 'master' Sean McGivern2016-12-131-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't require `API::API` in routesfix-autoloading-issueRémy Coutable2016-12-121-1/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'awards_handler-fixture' into 'master' Alfredo Sumaran2016-12-133-57/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace static fixture for awards_handler_spec (!7661)winniehell2016-12-123-57/+9
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'patch-8' into 'master' Stan Hu2016-12-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)Jon Bailey2016-12-121-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-eslint-warnings' into 'master' Alfredo Sumaran2016-12-132-8/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed lint warning and propose fail or warningfix-eslint-warningsLuke "Jared" Bennett2016-12-102-8/+10
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '25155-fix-edited-text-in-comments' into 'master' Fatih Acet2016-12-121-1/+1
|\ \ \ \ \ \ \ \ \