summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'see-full-size-avatar' into 'master'Dmitriy Zaporozhets2015-06-221-1/+2
|\
| * When we want to see the fullsize avatar of a user we can click the avatar on ...Sander Boom2015-03-211-1/+2
* | Merge branch 'remove_unused_except' into 'master'Dmitriy Zaporozhets2015-06-221-2/+2
|\ \
| * | projects doesn't seem to be a valid action in this controllerEaden2015-05-161-2/+2
* | | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-228-13/+19
|\ \ \
| * | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-225-9/+4
| * | | Update mock and stub syntax for specsRobert Speicher2015-06-223-4/+15
* | | | Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-221-33/+0
|\ \ \ \
| * | | | Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-171-33/+0
* | | | | Merge branch 'new-logo' into 'master'Dmitriy Zaporozhets2015-06-227-2/+58
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-197-2/+58
* | | | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-221-1/+6
|\ \ \ \ \
| * | | | | Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlfDouwe Maan2015-06-201-1/+6
* | | | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-2216-119/+228
|\ \ \ \ \ \
| * | | | | | Add MergeRequestTabs specsrs-dev-issue-2355Robert Speicher2015-06-211-44/+89
| * | | | | | Minor style fixes in MergeRequestTabsRobert Speicher2015-06-211-2/+2
| * | | | | | Use `skip_js` for commit timestampsRobert Speicher2015-06-171-1/+1
| * | | | | | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-172-3/+6
| * | | | | | Extract MergeRequest tab behavior to its own JS classRobert Speicher2015-06-172-88/+115
| * | | | | | Spec and refactor User.find_for_commitRobert Speicher2015-06-171-4/+20
| * | | | | | Remove duplicate `timeago` callRobert Speicher2015-06-171-2/+1
| * | | | | | Update time_ago_with_tooltip helperRobert Speicher2015-06-179-21/+40
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-2212-93/+188
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'new-mr-disable-change-target-branch' into 'master'Douwe Maan2015-06-201-6/+7
| |\ \ \ \ \
| | * | | | | Disable changing of target branch in new merge request page when a branch has...Stan Hu2015-06-191-6/+7
| | | |/ / / | | |/| | |
| * | | | | 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
| |/ / / /
* | | | | Merge branch 'snippet_optional_filename' into 'master'Douwe Maan2015-06-202-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make snippet filename optional.Nicolas2015-06-202-2/+1
* | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
View Lorry Controller Status