summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add last activity to user administrationBrandon Labuschagne2019-02-056-73/+128
* Make `ActionContorller::Parameters` serializable for sidekiq jobsPeter Leitzen2019-02-051-1/+30
* Merge branch 'fe-grammar-util' into 'master'Phil Hughes2019-02-051-0/+40
|\
| * Add grammar utilPaul Slaughter2019-02-041-0/+40
* | Merge branch 'search-title' into 'master'Sean McGivern2019-02-054-3/+15
|\ \
| * | Fix grammar and spellingHiroyuki Sato2019-02-053-3/+3
| * | Add 'in' filter that modifies scope of 'search' filter to issues and merge re...Hiroyuki Sato2019-01-144-3/+15
* | | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-052-8/+20
* | | Merge branch 'adriel-add-deployment-data' into 'master'Phil Hughes2019-02-052-0/+43
|\ \ \
| * | | Add deployment dataAdriel Santiago2019-02-042-0/+43
* | | | Updated document-register-element and registering emojis in the new wayTim Zallmann2019-02-051-9/+10
* | | | Merge branch 'update-pages-config-only-when-changed' into 'master'Grzegorz Bizon2019-02-051-7/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Do not reload daemon if configuration file of pages does not changeKamil Trzciński2019-01-161-15/+18
| * | | Update pages config only when changedKamil Trzciński2019-01-161-3/+20
* | | | Merge branch 'ssh-host-key-indifferent' into 'master'Stan Hu2019-02-041-0/+1
|\ \ \ \
| * | | | Allow SshHostKey.find_by to accept string keysNick Thomas2019-02-041-0/+1
* | | | | Merge branch 'adriel-handle-echarts-resize-events' into 'master'Phil Hughes2019-02-043-24/+65
|\ \ \ \ \
| * | | | | Handle window and container resize eventsAdriel Santiago2019-02-043-24/+65
| |/ / / /
* | | | | Merge branch 'fe-api-group-members' into 'master'Phil Hughes2019-02-041-0/+7
|\ \ \ \ \
| * | | | | Add groupMembers to api.jsPaul Slaughter2019-02-031-0/+7
* | | | | | gitlab-ui update with the new charting setupTim Zallmann2019-02-041-1/+1
* | | | | | Merge branch 'fj-regression-external-wiki-url' into 'master'Rémy Coutable2019-02-041-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Changed external wiki query method to prevent attribute cachingFrancisco Javier López2019-02-041-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'gt-externalize-app-views-instance_statistics' into 'master'Fatih Acet2019-02-044-10/+10
|\ \ \ \ \
| * | | | | Externalize strings from `/app/views/instance_statistics`George Tsiolis2019-02-044-10/+10
* | | | | | Merge branch 'fe-update-common-styles' into 'master'Annabel Dunstone Gray2019-02-041-1/+4
|\ \ \ \ \ \
| * | | | | | Replace h-13em with h-12emPaul Slaughter2019-02-031-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ce-mr-widget-service-endpoints-method' into 'master'Phil Hughes2019-02-041-3/+5
|\ \ \ \ \ \
| * | | | | | Extract extension method from mr_widget_optionsPaul Slaughter2019-02-031-3/+5
| |/ / / / /
* | | | | | Add programming language filtering to `/projects`Dylan MacKenzie2019-02-042-0/+16
| |_|/ / / |/| | | |
* | | | | Merge branch 'sh-fix-detect-host-keys' into 'master'Nick Thomas2019-02-041-1/+1
|\ \ \ \ \
| * | | | | Fix SSH Detect Host Keys not workingStan Hu2019-02-031-1/+1
* | | | | | accured -> occurred, as suggested in…Yaron Shahrabani2019-02-041-1/+1
* | | | | | DB and model changes for Sentry project selection dropdownReuben Pereira2019-02-041-5/+78
* | | | | | Merge branch '49388-refactor' into 'master'Grzegorz Bizon2019-02-041-3/+3
|\ \ \ \ \ \
| * | | | | | Refactor envs helper for claritysyasonik2019-01-291-3/+3
* | | | | | | Merge branch 'adriel-use-echarts-metrics-dashboard' into 'master'Phil Hughes2019-02-043-26/+17
|\ \ \ \ \ \ \
| * | | | | | | Use ECharts for metrics dashboardAdriel Santiago2019-02-013-26/+17
* | | | | | | | Fix template labelsFelipe Artur2019-02-041-1/+1
* | | | | | | | Merge branch '50521-block-emojis-and-symbol-characters-from-user-s-full-names...Filipa Lacerda2019-02-042-3/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Block emojis from user nameMartin Wortschack2019-02-012-3/+15
* | | | | | | | | Merge branch 'if-7693-smartcard_ldap_integration-ee_backport' into 'master'Dmitriy Zaporozhets2019-02-041-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport of ee/9235: Add LDAP integration to smartcard authenticationImre Farkas2019-01-271-0/+2
* | | | | | | | | | Merge branch 'fix-rubocop' into 'master'Rémy Coutable2019-02-041-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix ReturnInVoidContext rubocop offenseSemyon Pupkov2019-02-011-5/+7
* | | | | | | | | | | Merge branch 'update-ui-admin-appearance' into 'master'Phil Hughes2019-02-042-85/+90
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Update UI of admin appearance settingsAnnabel Dunstone Gray2019-02-012-85/+90
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-sim...Sean McGivern2019-02-0417-62/+309
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lockVersion should be required false and default 019745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneouslyFatih Acet2019-02-011-1/+2
| * | | | | | | | | | Address review commentsBrett Walker2019-01-312-18/+19