summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-icon-link-transparency' into 'master' Dmitriy Zaporozhets2015-12-021-0/+0
|\
| * Make icon-link image transparentrs-icon-link-transparencyRobert Speicher2015-12-011-0/+0
* | Merge pull request #9846 from fbeegle/masterDmitriy Zaporozhets2015-12-021-1/+1
|\ \ | |/ |/|
| * Update autocomplete_controller to be more readableFelipe Orlando2015-11-221-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-12-011-3/+7
|\ \
| * \ Merge branch 'upload_hook' into 'master' Valery Sizov2015-11-301-3/+7
| |\ \
| | * | Fire update hook from GitLabValery Sizov2015-11-301-3/+7
* | | | Merge pull request #9868 from yms9654/commit-without-whitespaceStan Hu2015-12-011-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Add ignore whitespace change option to commit viewMinsik Yoon2015-12-011-1/+6
| |/ /
* | | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher2015-11-301-1/+1
|\ \ \
| * | | Fix 404 in redirection after removing a projectStan Hu2015-11-251-1/+1
* | | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-3012-41/+65
|\ \ \ \ | |_|/ / |/| | |
| * | | test fixValery Sizov2015-11-301-1/+1
| * | | fix specsrails_update_to_4_2Valery Sizov2015-11-307-9/+9
| * | | fix notification_service specsValery Sizov2015-11-301-3/+2
| * | | Migrate mailers to ActiveJobValery Sizov2015-11-265-29/+55
| * | | Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-2610-78/+75
| |\ \ \
| * | | | Rails update to 4.2.4Valery Sizov2015-11-252-4/+3
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-301-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' Dmitriy Zaporozhets2015-11-301-0/+2
| |\ \ \ \ \
| | * | | | | If action link is not found, return nil.Marin Jankovski2015-11-251-0/+2
| | |/ / / /
* | | | | | Merge branch 'expire-application-settings-startup' of https://gitlab.com/stan...Dmitriy Zaporozhets2015-11-302-4/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Expire application settings from cache at startupStan Hu2015-11-252-4/+20
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-admin-page-personal-projects' into 'master' Dmitriy Zaporozhets2015-11-302-1/+14
|\ \ \ \ \
| * | | | | Fix Error 500 when viewing user's personal projects from admin pageStan Hu2015-11-252-1/+14
| |/ / / /
* | | | | Merge branch 'rs-clone-panel' into 'master' Dmitriy Zaporozhets2015-11-3011-76/+132
|\ \ \ \ \
| * | | | | Move project visibility level off of the clone panelrs-clone-panelRobert Speicher2015-11-273-8/+11
| * | | | | Clean up the Git protocol switcher JSRobert Speicher2015-11-241-6/+14
| * | | | | Add clipboard button to project clone panelRobert Speicher2015-11-245-11/+15
| * | | | | Rework the copy_to_clipboard logicRobert Speicher2015-11-245-34/+55
| * | | | | Move clipboard_button helper to ButtonHelper moduleRobert Speicher2015-11-242-8/+7
| * | | | | Move HTTP/SSH clone button logic to helpersRobert Speicher2015-11-242-16/+37
* | | | | | Merge branch 'jcorcuera/gitlab-ce-issue_3428'Douwe Maan2015-11-275-6/+41
|\ \ \ \ \ \
| * | | | | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-265-6/+41
* | | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-11-263-8/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-263-8/+8
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix typoJan-Gerd Tenberge2015-11-011-1/+1
| | * | | | | Fix merge errorJan-Gerd Tenberge2015-10-231-1/+1
| | * | | | | Fix merge errorJan-Gerd Tenberge2015-10-22445-4021/+5389
| | |\ \ \ \ \
| | * | | | | | Add scale argument in user classJan-Gerd Tenberge2015-09-262-4/+4
| | * | | | | | Add scale parameter to helperJan-Gerd Tenberge2015-09-261-2/+2
| | * | | | | | Add support for HiDPI displays in gravatar serviceJan-Gerd Tenberge2015-09-261-2/+2
* | | | | | | | Merge branch 'rs-markdown-preview' into 'master' Douwe Maan2015-11-263-77/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Decouple Markdown previews from DropzoneInputrs-markdown-previewRobert Speicher2015-11-253-77/+92
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow'Douwe Maan2015-11-261-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix raw private snippets access workflowDouglas Barbosa Alexandre2015-11-251-1/+1
| |/ / / / / /
* | | | | | | Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-251-2/+1
|/ / / / / /
* | | | | | Merge branch 'new-member-page' into 'master' Dmitriy Zaporozhets2015-11-259-76/+74
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Split group feature testsDmitriy Zaporozhets2015-11-252-2/+2
| * | | | | Improve project members page UIDmitriy Zaporozhets2015-11-256-49/+36