summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'group_milestones_description' into 'master'Dmitriy Zaporozhets2014-07-101-0/+12
|\
| * Use heading instead of strong and line breaks in description.Marin Jankovski2014-07-101-3/+1
| * Add milestone descriptions on the group show page.Marin Jankovski2014-07-101-0/+14
* | Added .closest() to find Reply button on click; fixes #401Ali Tavakoli2014-07-091-1/+1
|/
* Merge branch 'browse_file' into 'master'Dmitriy Zaporozhets2014-07-092-1/+13
|\
| * Add tests to check for correct browse link name.Marin Jankovski2014-07-091-5/+4
| * Move the links decision to helper.Marin Jankovski2014-07-092-6/+13
| * Differentiate between dirs, files and general code.Marin Jankovski2014-07-091-2/+5
| * Check if blob is requested.Marin Jankovski2014-07-091-1/+1
| * Show browse file if we are browsing file history.Marin Jankovski2014-07-091-1/+4
* | Active link based on controller rather than action.Marin Jankovski2014-07-091-1/+1
* | Update highlight.js to 8.1Dmitriy Zaporozhets2014-07-091-1/+1
|/
* Merge branch 'redirect_betwee_tree_and_blob' into 'master'Dmitriy Zaporozhets2014-07-092-4/+15
|\
| * Check if blob or tree and redirect to the correct one.Marin Jankovski2014-07-072-4/+15
* | Fix 500 on repo archive downloadDmitriy Zaporozhets2014-07-081-1/+1
* | Merge pull request #7222 from jhund/fix-5936Dmitriy Zaporozhets2014-07-082-3/+2
|\ \
| * | Don't remove trailing newline when editing a file in web UI editor:Jo Hund2014-06-272-3/+2
* | | Merge branch 'improve-email-threading' into 'master'Dmitriy Zaporozhets2014-07-074-51/+82
|\ \ \ | |_|/ |/| |
| * | Allow more mail clients to group emails by threadPierre de La Morinerie2014-07-034-51/+82
* | | Cleaner help pageDmitriy Zaporozhets2014-07-051-12/+12
* | | Merge branch 'notification_when_reopened' into 'master'Dmitriy Zaporozhets2014-07-056-0/+42
|\ \ \
| * | | Test if reopen notifications are sent.Marin Jankovski2014-07-031-1/+0
| * | | Reopen mr email notification.Marin Jankovski2014-07-035-0/+28
| * | | Notification for reopened issue.Marin Jankovski2014-07-032-0/+15
* | | | Truncate header titleDmitriy Zaporozhets2014-07-051-8/+5
* | | | Show full commit message and author name for Email on push serviceDmitriy Zaporozhets2014-07-042-2/+6
* | | | Merge pull request #7175 from jvanbaarsen/always-call-hooksDmitriy Zaporozhets2014-07-041-1/+5
|\ \ \ \
| * | | | Call every service, even if one failsJeroen van Baarsen2014-06-221-1/+5
* | | | | Merge branch 'flash_message_after_signup' into 'master'Dmitriy Zaporozhets2014-07-041-0/+8
|\ \ \ \ \
| * | | | | Redirect to sign in page after signup, this will show the correct flash message.Marin Jankovski2014-07-041-0/+8
* | | | | | Merge branch 'improve-ci-widget-ui' into 'master'Dmitriy Zaporozhets2014-07-041-4/+4
|\ \ \ \ \ \
| * | | | | | Use normal font instead of strong for ci status widgetDmitriy Zaporozhets2014-07-041-4/+4
| |/ / / / /
* | | | | | Merge branch 'fix-fork-branch-removal' into 'master'Dmitriy Zaporozhets2014-07-041-1/+1
|\ \ \ \ \ \
| * | | | | | Dont show 'Remove source brnach' checkbox for forkDmitriy Zaporozhets2014-07-041-1/+1
| |/ / / / /
* | | | | | Merge branch 'group_milestones_improvements' into 'master'Dmitriy Zaporozhets2014-07-042-10/+13
|\ \ \ \ \ \
| * | | | | | Improve performance, ordering and pagination for group milestones.Marin Jankovski2014-07-042-10/+13
| |/ / / / /
* | | | | | Use correct controller name, namespacing ignored.Marin Jankovski2014-07-041-1/+1
|/ / / / /
* | | | | Fix labels showing if issue closed on search results pageDmitriy Zaporozhets2014-07-032-3/+5
| |_|/ / |/| | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-07-031-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #7250 from ahmyi/patch-1Dmitriy Zaporozhets2014-07-031-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Archive with content-length headerahmyi2014-07-031-1/+1
| | * | | Content-length defined in header responseahmyi2014-07-031-0/+1
* | | | | Merge branch 'no_notification_for_merger' into 'master'Dmitriy Zaporozhets2014-07-031-0/+1
|\ \ \ \ \
| * | | | | Don't notify the user that triggered the mr notification.Marin Jankovski2014-07-031-1/+1
| * | | | | Remove new lines.Marin Jankovski2014-07-021-2/+0
| * | | | | Do not notify person who merged the MR.Marin Jankovski2014-07-021-0/+3
* | | | | | Do not notify project owner on project creation.Marin Jankovski2014-07-031-1/+1
| |/ / / / |/| | | |
* | | | | Reopen/close buttonsDmitriy Zaporozhets2014-07-032-4/+4
* | | | | Merge branch 'contributors-api' into 'master'Dmitriy Zaporozhets2014-07-031-0/+21
|\ \ \ \ \
| * | | | | Use Contributor class instead of hashDmitriy Zaporozhets2014-07-021-15/+10