Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update Grape to master.cs-upgrade-grape-again | Connor Shea | 2016-12-13 | 2 | -16/+21 |
* | Of course fixing this just reveals another bug. | Connor Shea | 2016-12-13 | 1 | -1/+1 |
* | Upgrade grape from 0.15.0 to 0.18.0. | Connor Shea | 2016-12-13 | 5 | -11/+14 |
* | Merge branch '20052-actions-table-vscroll' into 'master' | Annabel Dunstone Gray | 2016-12-13 | 3 | -13/+16 |
|\ | |||||
| * | Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscroll | Filipa Lacerda | 2016-12-13 | 3 | -13/+16 |
* | | Merge branch 'backport/group-policies' into 'master' | Rémy Coutable | 2016-12-13 | 2 | -0/+12 |
|\ \ | |||||
| * | | Backport hooks on group policies for the EE-specific implementationbackport/group-policies | Douglas Barbosa Alexandre | 2016-12-13 | 2 | -0/+12 |
* | | | Merge branch 'api-cherry-pick' into 'master' | Rémy Coutable | 2016-12-13 | 4 | -1/+148 |
|\ \ \ | |||||
| * | | | Make rubocop happyapi-cherry-pick | Robert Schilling | 2016-12-13 | 1 | -1/+1 |
| * | | | API: Ability to cherry-pick a commit | Robert Schilling | 2016-12-13 | 4 | -1/+148 |
* | | | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' | Rémy Coutable | 2016-12-13 | 3 | -2/+7 |
|\ \ \ \ | |||||
| * | | | | For single line git commit messages, the close quote should be on the same li...jzinn/gitlab-ce-chomp-git-status-message | Julian Zinn | 2016-12-13 | 3 | -2/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '25482-fix-api-sudo' into 'master' | Sean McGivern | 2016-12-13 | 7 | -113/+149 |
|\ \ \ \ | |||||
| * | | | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudo | Rémy Coutable | 2016-12-13 | 5 | -32/+15 |
| * | | | | API: Memoize the current_user so that the sudo can work properly | Rémy Coutable | 2016-12-12 | 5 | -96/+149 |
* | | | | | Merge branch 'move-admin-settings-feature-to-rspec' into 'master' | Rémy Coutable | 2016-12-13 | 3 | -57/+25 |
|\ \ \ \ \ | |||||
| * | | | | | Move admin settings spinach feature to rspec | jurre | 2016-12-13 | 3 | -57/+25 |
* | | | | | | Merge branch 'api-simple-group-project' into 'master' | Rémy Coutable | 2016-12-13 | 4 | -9/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | API: Ability to get group's project in simple representationapi-simple-group-project | Robert Schilling | 2016-12-13 | 4 | -9/+32 |
* | | | | | | | Merge branch 'dz-create-routes-lower-index' into 'master' | Dmitriy Zaporozhets | 2016-12-13 | 3 | -1/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add AddLowerPathIndexToRoutes to setup_postgresql.rake | Dmitriy Zaporozhets | 2016-12-13 | 1 | -0/+4 |
| * | | | | | | | Add index to routes table on lower path for postgresqldz-create-routes-lower-index | Dmitriy Zaporozhets | 2016-12-12 | 2 | -1/+23 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'allow-more-filenames' into 'master' | Rémy Coutable | 2016-12-13 | 3 | -2/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow all alphanumeric characters in file names (!8002) | winniehell | 2016-12-13 | 2 | -2/+6 |
| * | | | | | | | Add failing test for #20190 | winniehell | 2016-12-13 | 1 | -0/+44 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '25518-uniquely-style-labels' into 'master' | Fatih Acet | 2016-12-13 | 3 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | added border-radius and padding to labels25518-uniquely-style-labels | Dimitrie Hoekstra | 2016-12-13 | 3 | -1/+4 |
* | | | | | | | | Merge branch 'dz-nested-group-improvements-2' into 'master' | Sean McGivern | 2016-12-13 | 5 | -9/+25 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2 | Dmitriy Zaporozhets | 2016-12-11 | 3 | -9/+9 |
| * | | | | | | | Create nested group factory | Dmitriy Zaporozhets | 2016-12-11 | 2 | -0/+11 |
| * | | | | | | | Validate presence of route by Routable concern | Dmitriy Zaporozhets | 2016-12-11 | 2 | -0/+5 |
* | | | | | | | | Merge branch '3478-copy-commit-hash-to-clipboard' into 'master' | Sean McGivern | 2016-12-13 | 5 | -17/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix test3478-copy-commit-hash-to-clipboard | Victor Wu | 2016-12-12 | 1 | -1/+1 |
| * | | | | | | | | Tweak style and add back wording | victorwu | 2016-12-12 | 1 | -1/+2 |
| * | | | | | | | | Clean up commit copy to clipboard and make consistent | victorwu | 2016-12-12 | 4 | -15/+6 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-dif... | Fatih Acet | 2016-12-13 | 4 | -4/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image | Luke "Jared" Bennett | 2016-12-04 | 4 | -4/+11 |
* | | | | | | | | | Merge branch 'issue_13270' into 'master' | Sean McGivern | 2016-12-13 | 3 | -1/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow to delete tag release noteissue_13270 | Felipe Artur | 2016-12-12 | 3 | -1/+67 |
* | | | | | | | | | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' | Sean McGivern | 2016-12-13 | 2 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titles | Robert Schilling | 2016-12-13 | 2 | -2/+18 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix-autoloading-issue' into 'master' | Sean McGivern | 2016-12-13 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't require `API::API` in routesfix-autoloading-issue | Rémy Coutable | 2016-12-12 | 1 | -1/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'awards_handler-fixture' into 'master' | Alfredo Sumaran | 2016-12-13 | 3 | -57/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Replace static fixture for awards_handler_spec (!7661) | winniehell | 2016-12-12 | 3 | -57/+9 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'patch-8' into 'master' | Stan Hu | 2016-12-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day) | Jon Bailey | 2016-12-12 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix-eslint-warnings' into 'master' | Alfredo Sumaran | 2016-12-13 | 2 | -8/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed lint warning and propose fail or warningfix-eslint-warnings | Luke "Jared" Bennett | 2016-12-10 | 2 | -8/+10 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '25155-fix-edited-text-in-comments' into 'master' | Fatih Acet | 2016-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ |