summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-021-5/+6
|\
| * Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-021-5/+6
* | Merge branch 'rc/enable-PreferredHashMethods-cop' into 'master'Robert Speicher2017-06-028-17/+17
|\ \
| * | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-028-17/+17
* | | Merge branch '33139-lint-our-factories' into 'master'Grzegorz Bizon2017-06-021-1/+1
|\ \ \
| * | | Lint our factories creation in addition to their build33139-lint-our-factoriesRémy Coutable2017-06-021-1/+1
* | | | Merge branch 'jouve/gitlab-ce-admin_keys' into 'master'Rémy Coutable2017-06-021-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keysCyril Jouve2017-06-011-2/+2
* | | | Merge branch 'winh-styled-people-search-bar' into 'master'Tim Zallmann2017-06-024-16/+68
|\ \ \ \
| * | | | Style people in issuable search bar (!11402)winh-styled-people-search-barwinh2017-06-023-13/+65
| * | | | Move clear search button out of issuable search barwinh2017-06-022-3/+3
* | | | | Use throttle when window is resizedFilipa Lacerda2017-06-022-4/+2
* | | | | Merge branch '32983-merge-conflict-resolution-removed-the-newline-in-the-end-...Rémy Coutable2017-06-021-5/+7
|\ \ \ \ \
| * | | | | Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-011-5/+7
* | | | | | Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' i...James Lopez2017-06-021-1/+1
|\ \ \ \ \ \
| * | | | | | Add translations for elapsed time in words32747-translation-of-dates-for-cycle-analytics-is-incompleteRuben Davila2017-06-021-1/+1
* | | | | | | Merge branch '33215-fix-hard-delete-of-users' into 'master'Douwe Maan2017-06-021-5/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix hard-deleting users when they have authored issuesNick Thomas2017-06-021-5/+1
* | | | | | | | Merge branch 'blameless' into 'master'Rémy Coutable2017-06-023-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Promote blameless culture by using "annotate" insteadIlya Vassilevsky2017-06-023-3/+3
* | | | | | | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-0231-70/+276
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Minor refactor based on review feedbackkushalpandya2017-06-021-1/+1
| * | | | | | | | Address review comments31511-jira-settingsJarka Kadlecova2017-06-022-4/+4
| * | | | | | | | Action link role sets to `button` if no HREF is givenkushalpandya2017-06-011-2/+8
| * | | | | | | | Update as per reviewkushalpandya2017-06-011-1/+1
| * | | | | | | | Provide `test-url` via backendkushalpandya2017-06-011-1/+1
| * | | | | | | | Update as per review feedbackkushalpandya2017-06-012-27/+32
| * | | | | | | | Add doc commentkushalpandya2017-06-011-2/+15
| * | | | | | | | Address MR commentsJarka Kadlecova2017-06-014-1/+13
| * | | | | | | | Add comments for method and minor refinementskushalpandya2017-06-011-2/+7
| * | | | | | | | Fix class name typokushalpandya2017-06-012-2/+2
| * | | | | | | | Add feature tests for improved JIRA settingsJarka Kadlecova2017-06-014-16/+13
| * | | | | | | | Initialize canTestService from form metakushalpandya2017-06-011-4/+6
| * | | | | | | | Use `@service.can_test?` to enable test before savekushalpandya2017-06-011-1/+1
| * | | | | | | | Fix bug where form's `novalidate` attribute is not respectedkushalpandya2017-06-011-3/+7
| * | | | | | | | Validate config form only when service is marked activekushalpandya2017-06-011-4/+15
| * | | | | | | | Prevent default action of Flash banner action link clickkushalpandya2017-06-011-1/+2
| * | | | | | | | Remove test settings button, enhance Save changes button, include Integration...kushalpandya2017-06-011-3/+8
| * | | | | | | | Add support for action linkskushalpandya2017-06-012-2/+29
| * | | | | | | | Integrations Bundlekushalpandya2017-06-012-0/+106
| * | | | | | | | Add support for required input validationkushalpandya2017-06-011-3/+3
| * | | | | | | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-0123-50/+62
* | | | | | | | | Pipeline show view real time header sectionFilipa Lacerda2017-06-0216-48/+209
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch '33207-show-delete-option-in-admin-users-page' into 'master'Grzegorz Bizon2017-06-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow admins to delete users from the admin users pageNick Thomas2017-06-011-1/+1
* | | | | | | | | Merge branch '32538-url' into 'master'Tim Zallmann2017-06-021-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix IE11 error from sentry32538-urlSimon Knox2017-05-191-1/+2
* | | | | | | | | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-026-22/+51
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-012-2/+2
* | | | | | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-018-55/+189
|\ \ \ \ \ \ \ \ \