Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix labels showing if issue closed on search results page | Dmitriy Zaporozhets | 2014-07-03 | 2 | -3/+5 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-07-03 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #7250 from ahmyi/patch-1 | Dmitriy Zaporozhets | 2014-07-03 | 1 | -0/+1 |
| |\ | | | | | | | Content-length for Repository Archive | ||||
| | * | Archive with content-length header | ahmyi | 2014-07-03 | 1 | -1/+1 |
| | | | |||||
| | * | Content-length defined in header response | ahmyi | 2014-07-03 | 1 | -0/+1 |
| | | | | | | | | | Enable Content-Length to be defined in header response | ||||
* | | | Merge branch 'no_notification_for_merger' into 'master' | Dmitriy Zaporozhets | 2014-07-03 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No notification for merger Fixes #1378 See merge request !935 | ||||
| * | | | Don't notify the user that triggered the mr notification. | Marin Jankovski | 2014-07-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove new lines. | Marin Jankovski | 2014-07-02 | 1 | -2/+0 |
| | | | | |||||
| * | | | Do not notify person who merged the MR. | Marin Jankovski | 2014-07-02 | 1 | -0/+3 |
| | | | | |||||
* | | | | Do not notify project owner on project creation. | Marin Jankovski | 2014-07-03 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Reopen/close buttons | Dmitriy Zaporozhets | 2014-07-03 | 2 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'contributors-api' into 'master' | Dmitriy Zaporozhets | 2014-07-03 | 1 | -0/+21 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contributors api Fixes #1266 See merge request !934 | ||||
| * | | | Use Contributor class instead of hash | Dmitriy Zaporozhets | 2014-07-02 | 1 | -15/+10 |
| | | | | |||||
| * | | | Move API contributors logic to repository model | Dmitriy Zaporozhets | 2014-07-02 | 1 | -0/+26 |
| | | | | |||||
* | | | | Merge branch 'fix-snippet-comments' into 'master' | Dmitriy Zaporozhets | 2014-07-03 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fix snippet comments Also fixes #1209 See merge request !936 | ||||
| * | | | Fix project snippet comments loading | Dmitriy Zaporozhets | 2014-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Better UI for closed/reopen buttons | Dmitriy Zaporozhets | 2014-07-02 | 4 | -9/+9 |
|/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'assignement_change_notifications' into 'master' | Dmitriy Zaporozhets | 2014-07-02 | 3 | -4/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Assignment change notifications Fixes #1377 | ||||
| * | | | Remove unecessary return. | Marin Jankovski | 2014-07-02 | 1 | -2/+1 |
| | | | | |||||
| * | | | When assigning an unassigned issue send notification with the correct text. | Marin Jankovski | 2014-07-02 | 3 | -4/+18 |
| | |/ | |/| | |||||
* | | | Merge branch 'reference_merge_request_in_commit_message' into 'master' | Dmitriy Zaporozhets | 2014-07-02 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add reference to the merge request in the default merge request commit message This adds a link to the merge request to the merge request commit. If merge requests are used for code review, the merge in git is now linked to the code review. See http://feedback.gitlab.com/forums/176466-general/suggestions/6088000-in-the-default-merge-request-commit-message-add-a | ||||
| * | | Add a mention of the merge request into its default commit message. | Christian Taedcke | 2014-07-01 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master' | Dmitriy Zaporozhets | 2014-07-02 | 6 | -2/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed. | ||||
| * | | | Updated ATOM feed partials to use markdown instead of simple_format. | Kyle Fazzari | 2014-07-01 | 4 | -4/+4 |
| | | | | |||||
| * | | | Add summaries for notes and merge requests to dashboard feed. | Kyle Fazzari | 2014-05-29 | 4 | -0/+13 |
| | | | | | | | | | | | | | | | | This fixes #305. | ||||
* | | | | Merge pull request #7204 from cirosantilli/user-validation-msg | Dmitriy Zaporozhets | 2014-07-02 | 4 | -6/+9 |
|\ \ \ \ | | | | | | | | | | | Fix username validation message to match regexp. | ||||
| * | | | | Fix username validation message to match regexp. | Ciro Santilli | 2014-06-26 | 4 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | Also used for project, group and web ui new file names. | ||||
* | | | | | Merge pull request #6629 from sykano/fix-project-limit-for-groups | Dmitriy Zaporozhets | 2014-07-02 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | fix for project creation: group projects don't count towards user's project limit | ||||
| * | | | | fix for project creation: group projects don't count towards user's project ↵ | Steffen Knoth | 2014-04-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | limit | ||||
* | | | | | Merge branch 'issue_strong_param' into 'master' | Dmitriy Zaporozhets | 2014-07-01 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue strong param Fixes #1390 | ||||
| * | | | | | Create required issue param for new action. | Marin Jankovski | 2014-07-01 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-07-01 | 5 | -3/+23 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mail_template' into 'master' | Dmitriy Zaporozhets | 2014-07-01 | 2 | -2/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mail template changes (add the command line for http) when a project is moved in an other namespace. See subject, it is just the addition of the set-url for http(s) origin in the mails. | ||||
| | * | | | | | Add the http(s) command lines in the mails for the new origin when a project ↵ | Mathieu Schroeter | 2014-05-21 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | was moved in an other namespace. | ||||
| * | | | | | | Merge branch 'images-in-emails' into 'master' | Dmitriy Zaporozhets | 2014-07-01 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the width of images in emails In notification emails, large inline images can exceed the width of the viewport. This ensure that large images are resized to fit within the mail client window. | ||||
| | * | | | | | | Limit the width of images in emails | Pierre de La Morinerie | 2014-05-26 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue in Mail.app, where large images would expand outside of the viewport. | ||||
| * | | | | | | | Merge branch 'bugfix/304/dashboard_feed_note_urls' into 'master' | Dmitriy Zaporozhets | 2014-07-01 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Dashboard Feed URLs For Notes This MR fixes issue #304 by updating the app/helpers/events_helper.rb event_feed_url() function to also return a URL for the various types of notes. Without this change, no URL is returned, which causes any note events on the feed to link directly back to the feed. | ||||
| | * | | | | | | | Update events helper to remove wall-related sections. | Kyle Fazzari | 2014-06-25 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Update events helper to also return a URL for notes. | Kyle Fazzari | 2014-05-29 | 1 | -1/+12 |
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #304 since it was linking back to the dashboard feed only as a result of it being given no URL at all for notes. | ||||
| * | | | | | | | Merge branch 'css-fix' into 'master' | Dmitriy Zaporozhets | 2014-07-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS fix: 1px border on hover of last item in tree view I messed up my fork repository and hat to recreate it. So I closed MR !77 and created this one instead. Sorry for any inconvenience. @dzaporozhets: I changed the code and just added one line as you suggested. This merge request fixes issue #101. | ||||
| | * | | | | | | CSS fix | Max Ebersbacher | 2014-06-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1px border on hover of last item in tree view Fixes issue #101 | ||||
* | | | | | | | | Add title html option to issue and mr links in milestones to show title on ↵ | Marin Jankovski | 2014-07-01 | 4 | -4/+4 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | hover. | ||||
* | | | | | | | Merge branch 'group_milestones' into 'master' | Dmitriy Zaporozhets | 2014-07-01 | 13 | -0/+362 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Group milestones | ||||
| * | | | | | | | Add feature tests for group milestone. | Marin Jankovski | 2014-06-30 | 4 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | Fix styling issues. | Marin Jankovski | 2014-06-30 | 5 | -20/+13 |
| | | | | | | | | |||||
| * | | | | | | | Show all issues and merge requests that could be considered opened or ↵ | Marin Jankovski | 2014-06-30 | 4 | -9/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closed, includes reopened and merged. | ||||
| * | | | | | | | Correct authorization for group milestones. | Marin Jankovski | 2014-06-30 | 4 | -45/+18 |
| | | | | | | | | |||||
| * | | | | | | | Move milestone link in group head, 2 column milestone for MR and issues. | Marin Jankovski | 2014-06-30 | 9 | -33/+44 |
| | | | | | | | | |||||
| * | | | | | | | Start building group milestone show page. | Marin Jankovski | 2014-06-30 | 9 | -13/+190 |
| | | | | | | | | |||||
| * | | | | | | | Get one group milestone based on milestone title. | Marin Jankovski | 2014-06-30 | 3 | -10/+22 |
| | | | | | | | |