summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Resolve CE/EE diffs in admin groups formadmin-groups-form-scbLuke Bennett2019-05-161-1/+1
* Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master'Stan Hu2019-05-162-5/+5
|\
| * Fix an error in projects admin when statistics are missingRémy Coutable2019-05-162-5/+5
* | Merge branch 'flash-messages-scb' into 'master'Phil Hughes2019-05-161-0/+1
|\ \ | |/ |/|
| * Resolve CE/EE diffs in _flash_messagesflash-messages-scbLuke Bennett2019-05-161-0/+1
* | Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master'Rémy Coutable2019-05-161-4/+4
|\ \
| * | Fix Style/NegatedUnless offenses in HAML filesh-update-rubocop-and-gitlab-styles-ceRémy Coutable2019-05-161-4/+4
* | | Merge branch '59838-blocks' into 'master'Phil Hughes2019-05-162-4/+4
|\ \ \
| * | | Fixes stylelint issues for blocks.scss59838-blocksFilipa Lacerda2019-05-102-4/+4
* | | | Include MR information if possible when emailing notification of closing an i...Michał Zając2019-05-162-2/+2
* | | | Add Let's Encrypt clientVladimir Shushlin2019-05-161-3/+2
* | | | Merge branch 'help-scb' into 'master'Phil Hughes2019-05-161-2/+1
|\ \ \ \
| * | | | Resolve CE/EE diffs in help/indexhelp-scbLuke Bennett2019-05-151-2/+1
| | |_|/ | |/| |
* | | | Merge branch 'signup-box-scb' into 'master'Phil Hughes2019-05-161-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Resolve CE/EE diffs in signup_boxsignup-box-scbLuke Bennett2019-05-151-0/+1
| |/ /
* | | Merge branch 'new-proj-member-scb' into 'master'Phil Hughes2019-05-151-1/+2
|\ \ \
| * | | Resolve CE/EE diffs in new proj member importnew-proj-member-scbLuke Bennett2019-05-101-1/+2
| | |/ | |/|
* | | Merge branch 'proj-branches-index-scb' into 'master'Phil Hughes2019-05-151-0/+3
|\ \ \
| * | | Resolve CE/EE diffs in project branchesproj-branches-index-scbLuke Bennett2019-05-111-0/+3
| |/ /
* | | Merge branch 'layouts-scb' into 'master'Phil Hughes2019-05-1513-4/+31
|\ \ \
| * | | Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-1113-4/+31
| |/ /
* | | Merge branch 'health-check-scb' into 'master'Phil Hughes2019-05-151-1/+1
|\ \ \
| * | | Resolve CE/EE diffs in health checkhealth-check-scbLuke Bennett2019-05-111-1/+1
| |/ /
* | | Merge branch 'clone-panel-scb' into 'master'Phil Hughes2019-05-151-0/+5
|\ \ \
| * | | Resolve CE/EE diffs in _clone_panelclone-panel-scbLuke Bennett2019-05-141-0/+5
* | | | Merge branch 'zero-auth-proj-scb' into 'master'Phil Hughes2019-05-151-5/+10
|\ \ \ \
| * | | | Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scbLuke Bennett2019-05-111-5/+10
| | |/ / | |/| |
* | | | Merge branch 'tabs-ldap-scb' into 'master'Phil Hughes2019-05-151-0/+1
|\ \ \ \
| * | | | Resolve CE/EE diffs in devise ldap tabstabs-ldap-scbLuke Bennett2019-05-101-0/+1
| |/ / /
* | | | Merge branch 'next-badge-link' into 'master'Kushal Pandya2019-05-151-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove trailing whitespace for lintnext-badge-linkMarcel van Remmerden2019-05-131-1/+1
| * | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-131-3/+4
| | |/ | |/|
* | | Merge branch '55583-rename-method-conflicts' into 'master'Jan Provaznik2019-05-142-4/+4
|\ \ \ | |/ / |/| |
| * | Rename methods that conflict in Rails 5.255583-rename-method-conflictsHeinrich Lee Yu2019-05-122-4/+4
| |/
* | Merge branch 'ce-11542-remove-non-semantic-use-of-row-in-member-listing-contr...Kushal Pandya2019-05-131-1/+1
|\ \
| * | Remove non-semantic use of `.row` in member listing controlsce-11542-remove-non-semantic-use-of-row-in-member-listing-controlsDennis Tang2019-05-081-1/+1
* | | Merge branch 'qa-ml-fix-branches-test' into 'master'Sanad Liaquat2019-05-131-1/+1
|\ \ \ | |_|/ |/| |
| * | Add branch_name qa selectorqa-ml-fix-branches-testMark Lapierre2019-05-071-1/+1
* | | Open merge collab link in new tabtrojkilla2019-05-091-1/+1
* | | Merge branch 'support-string-piwik-website-ids' into 'master'Phil Hughes2019-05-091-1/+1
|\ \ \
| * | | Adds quotes to Matomo/Piwik website IDCDuv2019-05-081-1/+1
* | | | Merge branch '6105-move-ee-differences-group-members' into 'master'Phil Hughes2019-05-091-0/+2
|\ \ \ \
| * | | | CE: Move EE differences for6105-move-ee-differences-group-membersDonald Cook2019-05-071-0/+2
* | | | | i18n: externalize strings from user profile settingsantony liu2019-05-092-8/+8
* | | | | Resolve CE/EE diffs in admin/projects/show viewadmin-projects-show-scbLuke Bennett2019-05-081-0/+2
| |_|_|/ |/| | |
* | | | Merge branch '6361-move-ee-notify-text-haml' into 'master'Phil Hughes2019-05-081-0/+2
|\ \ \ \
| * | | | CE: Fixes EE differences for6361-move-ee-notify-text-hamlDonald Cook2019-05-071-0/+2
| |/ / /
* | | | Merge branch 'fe-header-row' into 'master'Phil Hughes2019-05-083-9/+26
|\ \ \ \
| * | | | Adds header column to variables listfe-header-rowFilipa Lacerda2019-05-073-9/+26
* | | | | Added user time settings fields to profileEzekiel Kigbo2019-05-072-0/+38
View Lorry Controller Status