summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'explain-wip-mr' into 'master'Dmitriy Zaporozhets2015-05-202-4/+13
|\
| * Remove italics and margin from merge request form help.Douwe Maan2015-05-201-1/+1
| * Fix copy.explain-wip-mrDouwe Maan2015-05-171-1/+1
| * Add explanation about WIP status to MR form.Douwe Maan2015-05-152-4/+13
* | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-183-20/+3
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-182-2/+2
|\ \
| * | Fix labels for project/snippet visibility selectionRobert Speicher2015-05-162-2/+2
| |/
* | Fill in email on the new password formVinnie Okada2015-05-162-2/+2
* | Explain reset token expiration in emailsVinnie Okada2015-05-162-0/+4
|/
* Fix push event.Douwe Maan2015-05-151-1/+1
* Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-155-5/+5
|\
| * Fix reference links in dashboard activity and ATOM feeds.dashboard-referencesDouwe Maan2015-05-145-5/+5
* | Merge branch 'spinner-spin' into 'master'Dmitriy Zaporozhets2015-05-151-6/+6
|\ \
| * | Spin icon next to "Checking for CI status..."spinner-spinDouwe Maan2015-05-141-6/+6
| |/
* | Use count badges with number_with_delimiter helper for issue, commit countDmitriy Zaporozhets2015-05-141-1/+1
* | Use slightly fewer icons in project sidebar.Douwe Maan2015-05-141-6/+0
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-142-12/+11
|\ \
| * | Always show note action icons.Douwe Maan2015-05-142-12/+11
| |/
* | Merge branch 'omniauth-csrf' into 'master'Dmitriy Zaporozhets2015-05-142-3/+3
|\ \ | |/ |/|
| * Protect OmniAuth request phase against CSRF.Douwe Maan2015-04-242-3/+3
* | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-133-1/+14
|\ \
| * \ Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-083-1/+14
| |\ \
| | * | Add feature to disable version checkDmitriy Zaporozhets2015-03-103-3/+11
| | * | Add version check to help page tooDmitriy Zaporozhets2015-03-091-0/+1
| | * | Add version check badge to admin areaDmitriy Zaporozhets2015-03-091-1/+5
* | | | Merge branch 'note-role' into 'master'Dmitriy Zaporozhets2015-05-121-9/+17
|\ \ \ \
| * | | | Show user roles by comments.Douwe Maan2015-05-121-9/+17
* | | | | Merge branch 'project-page' into 'master'Dmitriy Zaporozhets2015-05-124-65/+89
|\ \ \ \ \
| * | | | | Move "Forked from" above "Version".project-pageDouwe Maan2015-05-121-8/+9
| * | | | | Move clone panel to bottom of project sidebar.Douwe Maan2015-05-121-3/+3
| * | | | | Restructure project sidebar.Douwe Maan2015-05-121-62/+78
| * | | | | Fix alignment of ref picker, breadcrumb and buttons.Douwe Maan2015-05-121-1/+1
| * | | | | Add icons to more tabs.Douwe Maan2015-05-122-1/+8
| |/ / / /
* | | | | 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
View Lorry Controller Status