| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix rubucop offensesbitbucket-oauth2 | Douglas Barbosa Alexandre | 2016-12-16 | 1 | -27/+27 |
| | | |||||
| * | BB importer: Adressed more review comments | Valery Sizov | 2016-12-16 | 1 | -15/+19 |
| | | |||||
| * | BB importer: address review comment | Valery Sizov | 2016-12-16 | 1 | -6/+4 |
| | | |||||
| * | BB importer: Milestone importer | Valery Sizov | 2016-12-16 | 2 | -0/+6 |
| | | |||||
| * | BB importer: Fixed bug with putting expired token to a project.clone_url | Valery Sizov | 2016-12-15 | 3 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2 | Valery Sizov | 2016-12-14 | 16 | -43/+284 |
| |\ | |||||
| | * | Merge branch 'build-statuses' into 'master' | Rémy Coutable | 2016-12-14 | 16 | -43/+284 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots  ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989 | ||||
| | | * | Remove trailing blank line from Allowable module | Grzegorz Bizon | 2016-12-14 | 1 | -1/+0 |
| | | | | |||||
| | | * | Make it possible to mix `Gitlab::Routing` in | Grzegorz Bizon | 2016-12-13 | 2 | -1/+7 |
| | | | | |||||
| | | * | Extract abilities checking module from ability model | Grzegorz Bizon | 2016-12-13 | 2 | -1/+9 |
| | | | | |||||
| | | * | Refine build stop/play extended status specs | Grzegorz Bizon | 2016-12-13 | 1 | -4/+4 |
| | | | | |||||
| | | * | Use manual build icon in play/stop build statuses | Grzegorz Bizon | 2016-12-13 | 2 | -4/+12 |
| | | | | |||||
| | | * | Add specs for build stop extended detailed status | Grzegorz Bizon | 2016-12-12 | 1 | -4/+0 |
| | | | | |||||
| | | * | Fix build stop extended status CSS class | Grzegorz Bizon | 2016-12-12 | 1 | -4/+0 |
| | | | | |||||
| | | * | Fix path to build status details in common helpers | Grzegorz Bizon | 2016-12-12 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add action_class/action_title | Kamil Trzcinski | 2016-12-12 | 5 | -3/+30 |
| | | | | |||||
| | | * | Fix auto loading of constants for Ci Statuses | Kamil Trzcinski | 2016-12-12 | 4 | -5/+5 |
| | | | | |||||
| | | * | Fix some detailed statuses specs related to abilities | Grzegorz Bizon | 2016-12-12 | 2 | -1/+2 |
| | | | | |||||
| | | * | Incorporate permission checks into new CI statuses | Grzegorz Bizon | 2016-12-12 | 11 | -49/+60 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | | * | Refactor ci status factories to DRY code a little | Grzegorz Bizon | 2016-12-12 | 5 | -29/+28 |
| | | | | |||||
| | | * | Check permission of details | Kamil Trzcinski | 2016-12-12 | 4 | -7/+7 |
| | | | | |||||
| | | * | Introduce `cancelable` and `returnable` [ci skip] | Kamil Trzcinski | 2016-12-12 | 5 | -35/+64 |
| | | | | |||||
| | | * | Improve actions | Kamil Trzcinski | 2016-12-12 | 4 | -18/+106 |
| | | | | |||||
| | | * | Added Ci::Status::Build | Kamil Trzcinski | 2016-12-12 | 3 | -3/+76 |
| | | | | |||||
| * | | | BB importer: More advanced error handling | Valery Sizov | 2016-12-14 | 1 | -33/+47 |
| | | | | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2 | Valery Sizov | 2016-12-14 | 70 | -720/+1872 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'api-cherry-pick' into 'master' | Rémy Coutable | 2016-12-13 | 1 | -1/+35 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047 | ||||
| | | * | | API: Ability to cherry-pick a commit | Robert Schilling | 2016-12-13 | 1 | -1/+35 |
| | | |/ | |||||
| | * | | Merge branch '25482-fix-api-sudo' into 'master' | Sean McGivern | 2016-12-13 | 2 | -54/+77 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017 | ||||
| | | * | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudo | Rémy Coutable | 2016-12-13 | 1 | -13/+11 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | | * | | API: Memoize the current_user so that the sudo can work properly | Rémy Coutable | 2016-12-12 | 2 | -54/+79 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | The issue was arising when `#current_user` was called a second time after a user was impersonated: the `User#is_admin?` check would be performed on it and it would fail. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Merge branch 'api-simple-group-project' into 'master' | Rémy Coutable | 2016-12-13 | 1 | -1/+4 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060 | ||||
| | | * | | API: Ability to get group's project in simple representationapi-simple-group-project | Robert Schilling | 2016-12-13 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Merge branch 'dz-create-routes-lower-index' into 'master' | Dmitriy Zaporozhets | 2016-12-13 | 1 | -0/+4 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index to routes table on lower path for postgresql Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !8041 | ||||
| | | * | | | Add AddLowerPathIndexToRoutes to setup_postgresql.rake | Dmitriy Zaporozhets | 2016-12-13 | 1 | -0/+4 |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | Merge branch 'allow-more-filenames' into 'master' | Rémy Coutable | 2016-12-13 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002 | ||||
| | | * | | | Allow all alphanumeric characters in file names (!8002) | winniehell | 2016-12-13 | 1 | -2/+2 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'dz-nested-group-improvements-2' into 'master' | Sean McGivern | 2016-12-13 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Minor improvements to nested groups code See merge request !8011 | ||||
| | | * | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2 | Dmitriy Zaporozhets | 2016-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' | Sean McGivern | 2016-12-13 | 1 | -2/+2 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Don't allow blank MR titles in API Closes #25033 See merge request !7848 | ||||
| | | * | | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titles | Robert Schilling | 2016-12-13 | 1 | -2/+2 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'grapify-service-api' into 'master' | Rémy Coutable | 2016-12-12 | 2 | -65/+572 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the service API Related to #22928 See merge request !7970 | ||||
| | | * | | | Grapify the service API | Robert Schilling | 2016-12-09 | 2 | -65/+572 |
| | | | | | | |||||
| | * | | | | Merge branch 'unescape-relative-path' into 'master' | Gabriel Mazetto | 2016-12-12 | 1 | -8/+6 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid escaping relative links in Markdown twice ## What does this MR do? Avoid escaping relative links in Markdown twice. ## Why was this MR needed? Relative links with special characters (e.g. spaces) were escaped twice. ## What are the relevant issue numbers? closes #25191, #25318 See merge request !7940 | ||||
| | | * | | | | Avoid escaping relative links in Markdown twice (!7940) | winniehell | 2016-12-12 | 1 | -8/+6 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'api-fix-group-projects-filter' into 'master' | Rémy Coutable | 2016-12-12 | 1 | -1/+10 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Add the project filter to the groups endpoint. Related to #22928. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25420 See merge request !8034 | ||||
| | | * | | | | | API: Fix groups filter | Robert Schilling | 2016-12-12 | 1 | -1/+10 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'issue_25030' into 'master' | Sean McGivern | 2016-12-12 | 1 | -8/+8 |
| | |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow branch names with dots on API endpoint closes #25030 See merge request !7963 | ||||
| | | * | | | | | Allow branch names with dots on API endpointissue_25030 | Felipe Artur | 2016-12-08 | 1 | -8/+8 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'features/api-snippets' into 'master' | Sean McGivern | 2016-12-12 | 4 | -0/+153 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |