summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into job-details-increase-debounejob-details-increase-debouneFilipa Lacerda2017-06-02516-2148/+8579
|\
| * Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-0244-230/+726
| |\
| | * Minor refactor based on review feedbackkushalpandya2017-06-022-2/+3
| | * Address review comments31511-jira-settingsJarka Kadlecova2017-06-024-6/+6
| | * Action link role sets to `button` if no HREF is givenkushalpandya2017-06-011-2/+8
| | * Update as per reviewkushalpandya2017-06-012-2/+1
| | * Update tests based on source changeskushalpandya2017-06-011-7/+10
| | * Provide `test-url` via backendkushalpandya2017-06-011-1/+1
| | * Remove extra new linekushalpandya2017-06-011-1/+0
| | * Update as per review feedbackkushalpandya2017-06-012-27/+32
| | * Add doc commentkushalpandya2017-06-011-2/+15
| | * Address MR commentsJarka Kadlecova2017-06-016-4/+25
| | * Tests for `integration_settings_form`kushalpandya2017-06-012-0/+229
| | * Add comments for method and minor refinementskushalpandya2017-06-011-2/+7
| | * Fix class name typokushalpandya2017-06-012-2/+2
| | * fix failing specsJarka Kadlecova2017-06-013-41/+6
| | * Add feature tests for improved JIRA settingsJarka Kadlecova2017-06-017-19/+99
| | * 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
| | * Add Integrations bundlekushalpandya2017-06-011-0/+1
| | * 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-0130-174/+187
| * | Merge branch 'patch-23' into 'master'Sean Packham2017-06-021-6/+6
| |\ \
| | * | Rephrase to enhance readability. And some minor grammar.renzo2017-05-291-6/+6
| * | | Merge branch 'winh-karma-sourcemaps' into 'master'Filipa Lacerda2017-06-022-2/+2
| |\ \ \
| | * | | Use inline source maps for karma (!11815)winh-karma-sourcemapswinh2017-05-312-2/+2
| * | | | Merge branch '31849-pipeline-real-time-header' into 'master'Phil Hughes2017-06-0227-62/+375
| |\ \ \ \
| | * | | | Pipeline show view real time header sectionFilipa Lacerda2017-06-0227-62/+375
| |/ / / /
| * | | | Merge branch '33207-show-delete-option-in-admin-users-page' into 'master'Grzegorz Bizon2017-06-023-1/+7
| |\ \ \ \
| | * | | | Allow admins to delete users from the admin users pageNick Thomas2017-06-013-1/+7
| * | | | | Merge branch 'update-shell-5-0-5' into 'master'Sean McGivern2017-06-021-1/+1
| |\ \ \ \ \
| | * | | | | Update GITLAB_SHELL_VERSIONupdate-shell-5-0-5Alejandro Rodríguez2017-05-311-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
| * | | | | | | Merge branch 'winh-current-user-filter' into 'master'Phil Hughes2017-06-0211-22/+266
| |\ \ \ \ \ \ \
| | * | | | | | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-0211-22/+266
| |/ / / / / / /
| * | | | | | | Merge branch 'add-new-rake-task-for-gettext' into 'master'Douwe Maan2017-06-012-2/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-012-2/+9
| * | | | | | | | Merge branch 'bvl-move-gitlab-git-encodinghelper' into 'master'Robert Speicher2017-06-0112-75/+73
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-0112-75/+73
| |/ / / / / / / /
| * | | | | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-0115-57/+259
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Explicitly test etag cache invalidationzj-realtime-env-listZ.J. van de Weg2017-06-011-3/+8
| | * | | | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-01657-4449/+12690
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Test etag cache key changing valueZ.J. van de Weg2017-05-312-2/+19