summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-emailEric Eastwood2018-04-048-15/+96
| | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474 Conflicts: db/schema.rb ee/app/controllers/ee/admin/application_settings_controller.rb ee/app/helpers/ee/application_settings_helper.rb ee/app/models/ee/application_setting.rb ee/app/models/license.rb ee/app/views/layouts/service_desk.html.haml ee/app/views/notify/approved_merge_request_email.html.haml ee/app/views/notify/service_desk_new_note_email.text.erb ee/app/views/notify/service_desk_thank_you_email.text.erb ee/app/views/notify/unapproved_merge_request_email.html.haml ee/lib/ee/api/entities.rb ee/spec/controllers/admin/application_settings_controller_spec.rb ee/spec/models/application_setting_spec.rb ee/spec/requests/api/settings_spec.rb lib/api/settings.rb spec/mailers/previews/notify_preview.rb
* Merge branch 'dz-improve-app-settings-6' into 'master'Filipa Lacerda2018-04-0412-179/+319
|\ | | | | | | | | Redesign application settings to match project settings (part 6, final) See merge request gitlab-org/gitlab-ce!18168
| * Remove unused form for admin application settingsdz-improve-app-settings-6Dmitriy Zaporozhets2018-04-042-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move the rest of application settings to expandable blocksDmitriy Zaporozhets2018-04-0412-171/+319
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs' into 'master'Sean McGivern2018-04-047-5/+84
|\ \ | | | | | | | | | | | | Render MR commit SHA instead "diffs" when viable on GFM See merge request gitlab-org/gitlab-ce!18141
| * | Render MR commit SHA instead "diffs" when viableosw-41401-render-mr-commit-sha-instead-diffsOswaldo Ferreira2018-04-047-5/+84
| | |
* | | Merge branch '44983-transient-failure-in-user_sorts_issues_spec' into 'master'Sean McGivern2018-04-041-3/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Transient failure in spec/features/projects/issues/user_sorts_issues_spec.rb" Closes #44983 See merge request gitlab-org/gitlab-ce!18174
| * | | Fix a transient failure by removing unneeded expectationsRémy Coutable2018-04-041-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'issue_40915' into 'master'Sean McGivern2018-04-0422-47/+478
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow assigning and filtering issuables by ancestor group labels Closes #40915 See merge request gitlab-org/gitlab-ce!17873
| * | | | Allow assigning and filtering issuables by ancestor group labelsFelipe Artur2018-04-0422-47/+478
|/ / / /
* | | | Merge branch 'pdeden/gitlab-ee-patch-7' into 'master'Achilleas Pipinellis2018-04-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix syntax error in the `Envoy.blade.php` example See merge request gitlab-org/gitlab-ce!18177
| * | | | Envoy.blade.php syntax fixedpdeden/gitlab-ee-patch-7Patrick Deden2018-03-301-1/+1
| | | | |
* | | | | Merge branch 'feature_detect_co_authored_commits' into 'master'Douwe Maan2018-04-048-4/+386
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add banzai filter to detect commit message trailers and properly link the users Closes #31640 See merge request gitlab-org/gitlab-ce!17919
| * | | | Add banzai filter to detect commit message trailers and properly link the usersOmar Mekky2018-04-048-4/+386
|/ / / /
* | | | Merge branch 'sh-gitlab-sidekiq-logger' into 'master'Sean McGivern2018-04-049-1/+294
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Sidekiq JSON logging Closes #20060 See merge request gitlab-org/gitlab-ce!18121
| * | | | Add support for Sidekiq JSON loggingStan Hu2018-04-049-1/+294
| | | | | | | | | | | | | | | | | | | | Closes #20060
* | | | | Merge branch 'zj-revert-bad-grouping' into 'master'Grzegorz Bizon2018-04-043-5/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Allow CI/CD Jobs being grouped on version strings" Closes #44615 See merge request gitlab-org/gitlab-ce!18170
| * | | | | Revert changelog entry for removed featureZeger-Jan van de Weg2018-04-041-1/+0
| | | | | |
| * | | | | Revert "Allow CI/CD Jobs being grouped on version strings"Zeger-Jan van de Weg2018-04-042-4/+2
| |/ / / / | | | | | | | | | | | | | | | This reverts commit 4f2cdb51df0f2729055ec4dc6960ae347163da16.
* | | | | Merge branch 'zj-feature-gate-remove-http-api' into 'master'Douwe Maan2018-04-044-2/+61
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Allow feature gate removal through the API See merge request gitlab-org/gitlab-ce!18146
| * | | | Allow feature gate removal through the APIzj-feature-gate-remove-http-apiZeger-Jan van de Weg2018-04-034-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features could be listed and added through the api, now also removed. This was needed in the case of gitlab.com as the number of gates that were ever used just grows and cleaning up is hard.
* | | | | Merge branch 'ide-pending-tab' into 'master'Tim Zallmann2018-04-0423-178/+478
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added pending tabs to IDE See merge request gitlab-org/gitlab-ce!17936
| * | | | | Updated components to PascalCasePhil Hughes2018-04-044-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Added comment for `key` usage
| * | | | | Merge branch 'master' into ide-pending-tabPhil Hughes2018-04-03389-2911/+8500
| |\ \ \ \ \ | | |/ / / /
| * | | | | fixed karmaPhil Hughes2018-03-282-1/+4
| | | | | |
| * | | | | removed file changes that have no changes to make diff easierPhil Hughes2018-03-288-97/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified SET_FILE_ACTIVE openFiles map use .find in router so that it returns early instead of looping all the values
| * | | | | refactor ADD_PENDING_TAB to stop multiple state changesPhil Hughes2018-03-283-43/+26
| | | | | |
| * | | | | remove italics from tabPhil Hughes2018-03-281-4/+0
| | | | | |
| * | | | | fixed issue with spec because store wasn't getting resetPhil Hughes2018-03-281-1/+3
| | | | | |
| * | | | | added specsPhil Hughes2018-03-284-16/+229
| | | | | |
| * | | | | replace the tab with the review pending tabPhil Hughes2018-03-281-12/+17
| | | | | |
| * | | | | stops opening a pending tab if current tab is in review mode alreadyPhil Hughes2018-03-282-3/+11
| | | | | |
| * | | | | remove pending tab when opening a file from the left sidebarPhil Hughes2018-03-284-43/+17
| | | | | |
| * | | | | remove extra state propertyPhil Hughes2018-03-286-54/+50
| | | | | | | | | | | | | | | | | | | | | | | | pending tabs now get added into openfiles & just filtered correctly
| * | | | | fixed eslint inconsistent returnPhil Hughes2018-03-281-2/+3
| | | | | |
| * | | | | updated specsPhil Hughes2018-03-2812-30/+40
| | | | | |
| * | | | | correctly toggle between tabsPhil Hughes2018-03-284-9/+18
| | | | | |
| * | | | | opens the next open tab correctlyPhil Hughes2018-03-286-76/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes model being cached as undefined fixed open files not being correctly mutated
| * | | | | fixed opening next tab being a pending tabPhil Hughes2018-03-282-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | clears any active files when opening pending tab
| * | | | | fix closing & reopening pending tabsPhil Hughes2018-03-289-50/+71
| | | | | |
| * | | | | toggling viewer mode closes the pending tabPhil Hughes2018-03-285-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | then opens the file in edit mode
| * | | | | Added pending tabs to IDEPhil Hughes2018-03-2811-203/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pending tabs are normal tabs that are opened from the right sidebar. They are opened in diff mode and when changed to edit mode they get closed & the actual file gets opened.
* | | | | | Merge branch '20394-protected-branches-wildcard' into 'master'Rémy Coutable2018-04-046-6/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Protected branches count is wrong when a wildcard includes several protected branches" Closes #20394 See merge request gitlab-org/gitlab-ce!17920
| * | | | | | Resolve "Protected branches count is wrong when a wildcard includes several ↵Jan2018-04-046-6/+21
|/ / / / / / | | | | | | | | | | | | | | | | | | protected branches"
* | | | | | Merge branch 'update_code_quality_job' into 'master'Rémy Coutable2018-04-042-25/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard codequality job See merge request gitlab-org/gitlab-ce!18070
| * | | | | | Use standard codequality jobOlivier Gonzalez2018-04-042-25/+8
|/ / / / / /
* | | | | | Merge branch '39880-merge-method-api' into 'master'Rémy Coutable2018-04-045-1/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Allow the configuration of a project's merge method via the API" Closes #39880 See merge request gitlab-org/gitlab-ce!18031
| * | | | | | Resolve "Allow the configuration of a project's merge method via the API"Jan2018-04-045-1/+76
|/ / / / / /
* | | | | | Merge branch 'dz-improve-app-settings-5' into 'master'Filipa Lacerda2018-04-044-60/+88
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Redesign application settings to match project settings (part 5) See merge request gitlab-org/gitlab-ce!18159
| * | | | | Move network related app settings to expandable blocksDmitriy Zaporozhets2018-04-044-60/+88
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status