summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-127-3/+85
|\
| * Move "invalid 2FA code" error message to the flashRobert Speicher2015-05-091-3/+0
| * Autofocus the pin field on 2FA enable formRobert Speicher2015-05-091-1/+1
| * Quotes, icon helper in profiles/accounts/show viewRobert Speicher2015-05-091-5/+5
| * Add a hint on login form about using a recovery codeRobert Speicher2015-05-091-0/+1
| * Improve copy for enabling 2FARobert Speicher2015-05-092-4/+5
| * Update copy for generating new recovery codesRobert Speicher2015-05-091-4/+4
| * Refactor SessionsControllerRobert Speicher2015-05-091-1/+0
| * Fix nav and layout for TwoFactorAuthsControllerRobert Speicher2015-05-091-1/+1
| * Add page titles for two_factor_auths viewsRobert Speicher2015-05-093-0/+6
| * Update login views for two-factor authRobert Speicher2015-05-092-6/+2
| * Be consistent with what we call the 2FA featureRobert Speicher2015-05-094-11/+13
| * Update copy for recovery codesRobert Speicher2015-05-091-5/+4
| * Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-094-8/+24
| * Add support for backup codesDmitriy Zaporozhets2015-05-091-12/+23
| * Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap u...Dmitriy Zaporozhets2015-05-093-17/+34
| * Make 2 factor authentication workDmitriy Zaporozhets2015-05-092-2/+13
| * Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-092-0/+25
| * Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-091-1/+2
* | Fix commits feed button.create-merge-requestDouwe Maan2015-05-101-4/+4
* | Add Merge Request button to branches page.Douwe Maan2015-05-091-4/+7
* | Add Create Merge Request buttons to commits page and push event.Douwe Maan2015-05-093-9/+28
* | Link Commits tab to current branch from Compare page.Douwe Maan2015-05-091-1/+1
|/
* Merge pull request #9244 from dreis2211/firefox_issuable_filter_patchDmitriy Zaporozhets2015-05-081-2/+0
|\
| * Fix Firefox problems when it wants to render issuable componentdreis2015-05-051-2/+0
* | Move project visibility from clone bar to repository details block for non em...Marin Jankovski2015-05-082-2/+4
* | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-087-50/+53
|\ \
| * | Don't add js-task-list-container to things the user can't editRobert Speicher2015-05-063-4/+4
| * | Single quotes/icon helper in viewsRobert Speicher2015-05-065-39/+39
| * | Remove all references to `parse_tasks`Robert Speicher2015-05-062-2/+2
| * | Update task list behavior for Merge RequestsRobert Speicher2015-05-062-2/+4
| * | Update task list behavior for NotesRobert Speicher2015-05-062-4/+3
| * | Update task list behavior for IssuesRobert Speicher2015-05-062-2/+4
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-081-17/+17
|\ \ \
| * | | Fix bootlint issues on git clone holder barSullivan SENECHAL2015-05-071-17/+17
| |/ /
* | | Merge branch 'feature/handle-big-diffs' into 'master'Douwe Maan2015-05-072-4/+6
|\ \ \ | |/ / |/| |
| * | Improve handling of large diffsAlex Lossent2015-05-052-4/+6
| |/
* | Merge branch 'refactor-mr-form' into 'master'Dmitriy Zaporozhets2015-05-063-74/+15
|\ \
| * | Small UI improvements to MR formDmitriy Zaporozhets2015-05-063-5/+9
| * | Re-use issuable_form for new merge requestDmitriy Zaporozhets2015-05-061-69/+6
* | | Make README link on project home look nicerDmitriy Zaporozhets2015-05-061-4/+5
* | | Small UI improvements to make project sidebar more neatDmitriy Zaporozhets2015-05-062-7/+7
|/ /
* | When use change branches link at MR form - save source branch selection inste...mr-change-branchesDmitriy Zaporozhets2015-05-061-1/+1
* | Fix a trailing new lineStefan Tatschner2015-05-061-1/+0
* | Merge pull request #9241 from Soullivaneuh/button-typeJeroen van Baarsen2015-05-064-4/+6
|\ \
| * | Fix missing button typesSullivan SENECHAL2015-05-054-4/+6
| |/
* | Merge branch 'refactor-project-page' into 'master'Dmitriy Zaporozhets2015-05-067-122/+126
|\ \
| * | Restlye project sidebar a bit to make it more clearDmitriy Zaporozhets2015-05-051-11/+11
| * | Fix project description and avatar alignmentDmitriy Zaporozhets2015-05-053-6/+5
| * | Remove project dropdown and fix db sche,aDmitriy Zaporozhets2015-05-051-5/+0
View Lorry Controller Status