summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-201-1/+1
|\
| * Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-191-1/+1
* | Merge branch 'rs-blobview-js-refactor' into 'master'Robert Speicher2015-06-194-77/+152
|\ \
| * | Minor style fixes for LineHighlighterRobert Speicher2015-06-191-3/+3
| * | Refactor LineHighlighterrs-blobview-js-refactorRobert Speicher2015-06-191-41/+29
| * | Rename BlobView to LineHighlighterRobert Speicher2015-06-192-4/+4
| * | Simplify line numberingRobert Speicher2015-06-191-1/+1
| * | Use `pushState` instead of the temporary div hackRobert Speicher2015-06-191-36/+10
| * | Refactor and spec BlobView JSRobert Speicher2015-06-192-74/+187
| |/
* | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-194-5/+5
* | Add 2FA status to Admin::Users#showRobert Speicher2015-06-191-0/+8
* | Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-191-0/+12
* | Move the User dashboard enum further up in the classRobert Speicher2015-06-191-4/+3
|/
* Revert "Changed the placeholder text and modified the css class to make it vi...revert-placeholderDarby2015-06-182-5/+24
* Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-183-7/+3
|\
| * Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-183-7/+3
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-172-2/+8
|\ \
| * \ Merge branch 'swellard-issue-6123' into 'master'Dmitriy Zaporozhets2015-06-171-1/+3
| |\ \
| | * | Fix duplicate 'Email has already been taken' message when creating a user, up...swellard2015-06-161-1/+1
| | * | Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-161-1/+3
| * | | Merge branch 'rs-dev-issue-2373' into 'master'Dmitriy Zaporozhets2015-06-171-1/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
* | | | Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-172-24/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-162-24/+5
| |/ /
* | | Bootlint: Fix incorrectly nested `form-group` elementRobert Speicher2015-06-161-2/+2
* | | Bootlint: Add missing `type` attribute for buttonsRobert Speicher2015-06-162-1/+3
* | | Bootlint: Modals no longer need a '.hide' classRobert Speicher2015-06-168-8/+8
* | | Bootlint: Use offset grid classes instead of empty divsRobert Speicher2015-06-1610-18/+10
* | | Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-168-36/+82
|\ \ \ | |_|/ |/| |
| * | Support commenting on a diff in side-by-side viewStan Hu2015-06-168-36/+82
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-161-1/+3
|\ \ \ | |/ /
| * | Merge branch 'fix-ext-issue-webbased-hooks' into 'master'Douwe Maan2015-06-161-1/+3
| |\ \ | | |/ | |/|
| | * Fix hooks for web based events with external issue referencesDaniel Gerhardt2015-06-141-1/+3
* | | Merge branch 'header_layout_issue' into 'master'Douwe Maan2015-06-164-17/+14
|\ \ \
| * | | Fix layout issue in header title truncation.Nicolas2015-06-164-17/+14
| |/ /
* | | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-163-14/+25
|\ \ \ | |/ / |/| |
| * | Fix consistency issues on New Application page.Nicolas2015-06-152-3/+9
| * | Fix layout issue when New Application validation fails.Nicolas2015-06-151-10/+15
| * | Highlight Applications nav item when validation fails.Nicolas2015-06-141-1/+1
| |/
* | Look for .gitlab-ci.yml only if checkout_sha is presentfix-gitlab-ci-ymlDmitriy Zaporozhets2015-06-151-9/+13
* | Merge branch 'fix-ext-issue-tracker-hook' into 'master'Dmitriy Zaporozhets2015-06-151-10/+5
|\ \
| * | Fix external issue tracker hook/test for HTTPS URLsdgerhardt/gitlab-ce-fix-ext-issue-tracker-hookDaniel Gerhardt2015-06-051-10/+5
* | | Fix text align in last push eventDmitriy Zaporozhets2015-06-151-1/+1
* | | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-1529-224/+312
|\ \ \
| * | | Refactor RootControllerRobert Speicher2015-06-131-2/+12
| * | | Refactor dashboard_choicesRobert Speicher2015-06-131-13/+16
| * | | Remove redundant help text from custom dashboard selectionRobert Speicher2015-06-131-2/+0
| * | | Fix alignment of Behavior form; add documentation linkRobert Speicher2015-06-131-2/+4
| * | | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-131-4/+9
| * | | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-131-2/+2
View Lorry Controller Status