Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'animation-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 4 | -18/+38 |
|\ | |||||
| * | fixed the resizing icon issueanimation-sidebar | Darby | 2015-06-22 | 1 | -2/+2 |
| * | Edited the CSS of header and sidebar; added a new class of logo-container to ... | Darby | 2015-06-19 | 4 | -16/+36 |
* | | Merge branch 'rs-dev-issue-2414' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 2 | -18/+24 |
|\ \ | |||||
| * | | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414 | Robert Speicher | 2015-06-22 | 1 | -14/+3 |
| * | | Make default value for otp_required_for_login false instead of null | Robert Speicher | 2015-06-20 | 1 | -4/+4 |
| * | | Allow Admin to filter users by 2FA status | Robert Speicher | 2015-06-19 | 2 | -4/+21 |
* | | | Merge branch 'revert-mr-state-names' | Dmitriy Zaporozhets | 2015-06-22 | 11 | -35/+35 |
|\ \ \ | |||||
| * | | | Fix closed merge request scope at milestone page | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+1 |
| * | | | Revert merge request states renaming | Dmitriy Zaporozhets | 2015-06-19 | 11 | -34/+34 |
* | | | | Merge branch 'see-full-size-avatar' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | When we want to see the fullsize avatar of a user we can click the avatar on ... | Sander Boom | 2015-03-21 | 1 | -1/+2 |
* | | | | | Merge branch 'remove_unused_except' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | projects doesn't seem to be a valid action in this controller | Eaden | 2015-05-16 | 1 | -2/+2 |
* | | | | | | Merge branch 'rs-rspec3' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 8 | -13/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace remaining references to `Note.create_cross_reference_note` | Robert Speicher | 2015-06-22 | 5 | -9/+4 |
| * | | | | | | Update mock and stub syntax for specs | Robert Speicher | 2015-06-22 | 3 | -4/+15 |
* | | | | | | | Merge branch 'rs-remove-link-to-override' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -33/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove overridden `link_to` helperrs-remove-link-to-override | Robert Speicher | 2015-06-17 | 1 | -33/+0 |
* | | | | | | | | Merge branch 'new-logo' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 7 | -2/+58 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Replace old logo with new onenew-logo | Dmitriy Zaporozhets | 2015-06-19 | 7 | -2/+58 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'web-editor-autocrlf' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlf | Douwe Maan | 2015-06-20 | 1 | -1/+6 |
* | | | | | | | | Merge branch 'rs-dev-issue-2355' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 16 | -119/+228 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add MergeRequestTabs specsrs-dev-issue-2355 | Robert Speicher | 2015-06-21 | 1 | -44/+89 |
| * | | | | | | | | Minor style fixes in MergeRequestTabs | Robert Speicher | 2015-06-21 | 1 | -2/+2 |
| * | | | | | | | | Use `skip_js` for commit timestamps | Robert Speicher | 2015-06-17 | 1 | -1/+1 |
| * | | | | | | | | Load the Merge Request > Commits tab lazily | Robert Speicher | 2015-06-17 | 2 | -3/+6 |
| * | | | | | | | | Extract MergeRequest tab behavior to its own JS class | Robert Speicher | 2015-06-17 | 2 | -88/+115 |
| * | | | | | | | | Spec and refactor User.find_for_commit | Robert Speicher | 2015-06-17 | 1 | -4/+20 |
| * | | | | | | | | Remove duplicate `timeago` call | Robert Speicher | 2015-06-17 | 1 | -2/+1 |
| * | | | | | | | | Update time_ago_with_tooltip helper | Robert Speicher | 2015-06-17 | 9 | -21/+40 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-06-22 | 12 | -93/+188 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'new-mr-disable-change-target-branch' into 'master' | Douwe Maan | 2015-06-20 | 1 | -6/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Disable changing of target branch in new merge request page when a branch has... | Stan Hu | 2015-06-19 | 1 | -6/+7 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'fix-error-500-internal-snippet' into 'master' | Douwe Maan | 2015-06-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix Error 500 when one user attempts to access a personal, internal snippet | Stan Hu | 2015-06-19 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'rs-blobview-js-refactor' into 'master' | Robert Speicher | 2015-06-19 | 4 | -77/+152 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Minor style fixes for LineHighlighter | Robert Speicher | 2015-06-19 | 1 | -3/+3 |
| | * | | | | | | Refactor LineHighlighterrs-blobview-js-refactor | Robert Speicher | 2015-06-19 | 1 | -41/+29 |
| | * | | | | | | Rename BlobView to LineHighlighter | Robert Speicher | 2015-06-19 | 2 | -4/+4 |
| | * | | | | | | Simplify line numbering | Robert Speicher | 2015-06-19 | 1 | -1/+1 |
| | * | | | | | | Use `pushState` instead of the temporary div hack | Robert Speicher | 2015-06-19 | 1 | -36/+10 |
| | * | | | | | | Refactor and spec BlobView JS | Robert Speicher | 2015-06-19 | 2 | -74/+187 |
| | |/ / / / / | |||||
| * | | | | | | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415 | Robert Speicher | 2015-06-19 | 4 | -5/+5 |
| * | | | | | | Add 2FA status to Admin::Users#show | Robert Speicher | 2015-06-19 | 1 | -0/+8 |
| * | | | | | | Add convenience methods to User for getting and setting 2FA status | Robert Speicher | 2015-06-19 | 1 | -0/+12 |
| * | | | | | | Move the User dashboard enum further up in the class | Robert Speicher | 2015-06-19 | 1 | -4/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'snippet_optional_filename' into 'master' | Douwe Maan | 2015-06-20 | 2 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Make snippet filename optional. | Nicolas | 2015-06-20 | 2 | -2/+1 |