| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' | Filipa Lacerda | 2017-03-16 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Add 'Undo mark all as done' to Todos Closes #27114 See merge request !9890 | ||||
| | * | Add 'Undo mark all as done' to Todos | Jacopo | 2017-03-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | Added the ability to 'Undo mark all as done' todos marked as complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard. The operation undos only the todo previously marked as done with the 'Mark al as done' button. | ||||
| * | | Merge branch 'fix-legacy-emojis-using-unicode-file-name' into 'master' | Sean McGivern | 2017-03-16 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | Restore unicode file name images for legacy img emojis See merge request !9986 | ||||
| | * | | Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-name | Eric Eastwood | 2017-03-16 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'remove-es6-extension-configuration' into 'master' | Filipa Lacerda | 2017-03-16 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove remaining references to .es6 file extension in our config files and documentation See merge request !9980 | ||||
| | * | | | remove all references to the .es6 in our config files and documentationremove-es6-extension-configuration | Mike Greiling | 2017-03-15 | 2 | -3/+3 |
| | |/ / | |||||
| * | | | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'remove-satellites' into 'master' | Douwe Maan | 2017-03-14 | 1 | -10/+0 |
| |\ \ | | | | | | | | | | | | | Remove unused satellites config See merge request !9919 | ||||
| | * | | Remove unused satellites config | Stan Hu | 2017-03-13 | 1 | -10/+0 |
| | |/ | | | | | | | | | Note that the old migrations depend on 1_settings.rb, so we can't quite remove those completely. | ||||
| * | | Merge branch '29389-fix-already-initialized-constants' into 'master' | Robert Speicher | 2017-03-14 | 2 | -9/+6 |
| |\ \ | |/ |/| | | | | | | | | | Remove explicit `require` calls, and use `require_dependency` when needed Closes #29389 See merge request !9899 | ||||
| | * | Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constants | Rémy Coutable | 2017-03-13 | 2 | -9/+6 |
| | | | | | | | | | | | | | | | | | See http://guides.rubyonrails.org/autoloading_and_reloading_constants.html for more info. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 2 | -8/+13 |
| |\ \ | |/ |/| | | | | | Create a new issue for a single discussion See merge request !8266 | ||||
| | * | Don't instrument `app/services/concerns` | Bob Van Landuyt | 2017-03-13 | 1 | -7/+11 |
| | | | |||||
| | * | Move `ResolveDiscussions` into `concerns/issues` folder | Bob Van Landuyt | 2017-03-13 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'backport-cache-middleware-fix' into 'master' | Rémy Coutable | 2017-03-13 | 1 | -0/+24 |
| |\ \ | |/ |/| | | | | | Backport cache middleware fix See merge request !9867 | ||||
| | * | Try out the monkey patch to fix the middlewarebackport-cache-middleware-fix | Lin Jen-Shin | 2017-03-11 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | which isn't properly cleaning up whenever something is thrown, not raised. See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1402#note_25128108 | ||||
| * | | Execute inflections initializer earlierfix/execute-inflections-initializer-early | Douglas Barbosa Alexandre | 2017-03-10 | 1 | -0/+0 |
| |/ | |||||
| * | Merge branch 'enable-snippets-by-default' into 'master' | Douwe Maan | 2017-03-10 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | Enable snippets for new projects by default Closes #28192 See merge request !9857 | ||||
| | * | Enable snippets for new projects by defaultenable-snippets-by-default | Sean McGivern | 2017-03-10 | 2 | -2/+2 |
| | | | | | | | | | | | If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change. | ||||
| * | | Document gitaly.socket_path setting | Jacob Vosmaer | 2017-03-10 | 1 | -0/+10 |
| |/ | |||||
| * | Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master' | Filipa Lacerda | 2017-03-09 | 1 | -2/+1 |
| |\ | | | | | | | | | Update emojis to use harmony modules (import/export) See merge request !9784 | ||||
| | * | Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modules | Eric Eastwood | 2017-03-08 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'storage-validation-improvement' into 'master' | Sean McGivern | 2017-03-09 | 1 | -6/+10 |
| |\ \ | | | | | | | | | | | | | Improve storage validation after configuration structure update See merge request !9811 | ||||
| | * | | Improve storage validation after configuration structure updatestorage-validation-improvement | Alejandro Rodríguez | 2017-03-08 | 1 | -6/+10 |
| | |/ | | | | | | | | | | | | | | | | | | | Besides improving the error message to specify what exactly you need to do to solve the error, we now don't skip all storage validations on the test environment, so that you also get a nice error message if you're running tests. Now if conditions are met to skip valitaions (test env or env variable) we still make sure the settings _look_ sane, we just skip verifying the paths exists and meet the given conditions. | ||||
| * | | Merge branch 'move-u2f-bundle' into 'master' | Alfredo Sumaran | 2017-03-09 | 2 | -1/+1 |
| |\ \ | |/ |/| | | | | | Move u2f javascript library to webpack config See merge request !9755 | ||||
| | * | move u2f library to webpackmove-u2f-bundle | Mike Greiling | 2017-03-07 | 2 | -1/+1 |
| | | | |||||
| * | | Clear AR connections before starting Sidekiq | Yorick Peterse | 2017-03-08 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | This should ensure that connections obtained before starting Sidekiq are not leaked, leading to connection timeouts. Fixes gitlab-com/infrastructure#1139 | ||||
| * | | Merge branch '29005-rspec-profiling-errors-to-warnings' into 'master' | Robert Speicher | 2017-03-07 | 1 | -9/+28 |
| |\ \ | | | | | | | | | | | | | | | | | | | Swallow collection errors in RspecProfiling Closes #29005 See merge request !9765 | ||||
| | * | | Swallow collection errors in RspecProfiling | Nick Thomas | 2017-03-07 | 1 | -9/+28 |
| | | | | |||||
| * | | | Merge branch ↵ | Sean McGivern | 2017-03-07 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages' into 'master' Resolve "Combine Deploy Keys and Push Rules and Mirror Repository and Protect Branches settings pages" Closes #26732 See merge request !8731 | ||||
| | * \ \ | Merge branch 'master' into ↵26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages | Phil Hughes | 2017-03-07 | 9 | -13/+22 |
| | |\ \ \ | | | |/ | | |/| | | | | | 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages | ||||
| | * | | | Added repository controller and route for the settings namespace | Jose Ivan Vargas | 2017-03-06 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Added Prometheus Service and Prometheus graphs | Kamil Trzciński | 2017-03-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 3 | -11/+30 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| | * | | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 3 | -11/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
| * | | | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' | James Lopez | 2017-03-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Change project count limit from 10 to 100000 See merge request !9767 | ||||
| | * | | | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limit | Regis Freyd | 2017-03-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 5 | -4/+53 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| | * | | | | | Add specs for Doorkeeper resource_owner_authenticator | Markus Koller | 2017-03-07 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Implement OpenID Connect identity provider | Markus Koller | 2017-03-07 | 5 | -2/+51 |
| | |/ / / / | |||||
| * | | | | | Merge remote-tracking branch ↵ | Douwe Maan | 2017-03-07 | 1 | -0/+5 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | 'origin/personal_access_token_api_and_impersonation_token' | ||||
| | * | | | | applies relevant changes to the code and code structure | Tiago Botelho | 2017-02-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | add admin panel for personal access tokens | Simon Vocella | 2017-02-28 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Improve pipeline triggers UI | Kamil Trzciński | 2017-03-07 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | Moved call of SystemHooksService from UpdateMergeRequestsWorker to ↵ | gpongelli | 2017-03-07 | 1 | -0/+1 |
| | |_|_|/ |/| | | | | | | | | | | | GitPushServic… | ||||
| * | | | | Merge branch '26371-native-emojis-v3' into 'master' | Filipa Lacerda | 2017-03-07 | 4 | -5/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569 | ||||
| | * | | | | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 4 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474 | ||||
| * | | | | | Merge branch 'backport-ee-change-webpack-empty-states' into 'master' | Jacob Schatz | 2017-03-07 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Backport change introduced in EE - alias for empty states SVGs See merge request !9683 | ||||
| | * | | | | | Backport change introduced in EE - alias for empty states SVGsbackport-ee-change-webpack-empty-states | Filipa Lacerda | 2017-03-03 | 1 | -0/+1 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Add Upload model and UploadChecksumWorker worker | Robert Speicher | 2017-03-06 | 1 | -0/+1 |
| | |/ / / |/| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |