| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix default tooltip placementrs-default-tooltip-placement | Robert Speicher | 2015-05-17 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'rs-reversible-migrations' into 'master' | Robert Speicher | 2015-05-16 | 3 | -3/+22 |
| |\ | | | | | | | | | | | Make more migrations reversible See merge request !646 | ||||
| | * | Make more migrations reversiblers-reversable-migrations | Robert Speicher | 2015-05-13 | 3 | -3/+22 |
| | | | | | | | | | [ci skip] | ||||
| * | | Merge branch 'unauthorized-participants' into 'master' | Dmitriy Zaporozhets | 2015-05-16 | 6 | -22/+42 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Don't send notifications to mentioned users that don't have access to the project in question. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325. See merge request !664 | ||||
| | * | | Fix specs.unauthorized-participants | Douwe Maan | 2015-05-15 | 3 | -7/+12 |
| | | | | |||||
| | * | | Fix. | Douwe Maan | 2015-05-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Don't include users without project access in participants. | Douwe Maan | 2015-05-15 | 2 | -7/+15 |
| | | | | |||||
| | * | | Move stuff around a bit in NotifictionService. | Douwe Maan | 2015-05-15 | 1 | -8/+15 |
| | | | | |||||
| * | | | Merge branch 'fix-docker-single-postgresql-startup' into 'master' | Sytse Sijbrandij | 2015-05-15 | 2 | -0/+38 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set gitlab.rb in Docker single image to make PostgreSQL start up properly See gitlab-org/omnibus-gitlab#552 See merge request !661 | ||||
| | * | | | Set gitlab.rb in Docker single image in order to make PostgreSQL start up ↵ | Stan Hu | 2015-05-15 | 2 | -0/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | properly See gitlab-org/omnibus-gitlab#552 | ||||
| * | | | | Merge branch 'attr_encryped_no_db_connection' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 1 | -0/+20 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require DB connection in AttrEncrypted. See merge request !667 | ||||
| | * | | | | Fix. | Douwe Maan | 2015-05-15 | 1 | -13/+5 |
| | | | | | | |||||
| | * | | | | Improve fix.attr_encryped_no_db_connection | Douwe Maan | 2015-05-15 | 1 | -13/+12 |
| | | | | | | |||||
| | * | | | | Don't require DB conncetion in AttrEncrypted. | Douwe Maan | 2015-05-15 | 1 | -0/+29 |
| |/ / / / | |||||
| * | | | | Merge pull request #9277 from jvanbaarsen/pr/9061 | Jeroen van Baarsen | 2015-05-15 | 2 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | Ensure that the first added admin performs repository imports | ||||
| | * | | | | Ensure that the first added admin performs repository imports | Fotis Gimian | 2015-05-15 | 2 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch '7-11-guides' into 'master' | Job van der Voort | 2015-05-15 | 3 | -16/+120 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | Update installation/update guides for 7.11. See merge request !665 | ||||
| | * | | | | Update installation/update guides for 7.11. | Douwe Maan | 2015-05-15 | 3 | -16/+120 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-653' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix push event. Fixes issue with !653. See merge request !663 | ||||
| | * | | | Fix push event. | Douwe Maan | 2015-05-15 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-15 | 14 | -33/+50 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'dashboard-references' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 11 | -22/+30 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653 | ||||
| | | * | | | Fix reference links in dashboard activity and ATOM feeds.dashboard-references | Douwe Maan | 2015-05-14 | 11 | -22/+30 |
| | | | | | | |||||
| | * | | | | Merge branch 'spinner-spin' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 2 | -6/+7 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655 | ||||
| | | * | | | | Spin icon next to "Checking for CI status..."spinner-spin | Douwe Maan | 2015-05-14 | 2 | -6/+7 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'use-count-badges' into 'master' | Dmitriy Zaporozhets | 2015-05-15 | 2 | -5/+13 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use count badges with number_with_delimiter helper for issue, commit count See merge request !658 | ||||
| | | * | | | | Small refactoring of state_filters_text_for helperuse-count-badges | Dmitriy Zaporozhets | 2015-05-14 | 1 | -3/+2 |
| | | | | | | | |||||
| | | * | | | | append empty space only if count exists | Dmitriy Zaporozhets | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Use count badges with number_with_delimiter helper for issue, commit count | Dmitriy Zaporozhets | 2015-05-14 | 2 | -5/+14 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9296 from jorgevbo/master | Jeroen van Baarsen | 2015-05-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix bug with default timezone en RSS gitlab events | ||||
| | * | | | | | Fix bug with default timezone en RSS gitlab events | Jorge Vasquez | 2015-05-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix gemfile.lock | Dmitriy Zaporozhets | 2015-05-15 | 1 | -1/+1 |
| | |_|_|/ / |/| | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 8 | -12/+54 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | Merge branch 'project_api_order' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -1/+18 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656 | ||||
| | | * | | | | update API docproject_api_order | Valery Sizov | 2015-05-14 | 1 | -0/+3 |
| | | | | | | | |||||
| | | * | | | | Add order option for projects API | Valery Sizov | 2015-05-14 | 2 | -1/+15 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'rs-refactor-2fa' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 2 | -9/+33 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor SessionsController to use a controller concern See merge request !659 | ||||
| | | * | | | | | Refactor SessionsController to use a controller concernrs-refactor-2fa | Robert Speicher | 2015-05-14 | 2 | -9/+33 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch 'fix-blob-path' into 'master' | Douwe Maan | 2015-05-14 | 3 | -2/+3 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651 | ||||
| | | * | | | | Fix broken view when viewing history of a file that includes a path that ↵ | Stan Hu | 2015-05-13 | 3 | -2/+3 |
| | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | used to be another file Closes #1598 | ||||
| * | | | | | Merge pull request #9295 from afc163/master | Jeroen van Baarsen | 2015-05-14 | 2 | -0/+17 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Add style for <kbd> element in markdown | ||||
| | * | | | | Add style for <kbd> element in markdown | afc163 | 2015-05-14 | 2 | -0/+17 |
| |/ / / / | | | | | | | | | | | | | Fixes #5825 | ||||
| * | | | | Merge branch 'fewer-icons' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 1 | -6/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use slightly fewer icons in project sidebar.  See merge request !657 | ||||
| | * | | | | Use slightly fewer icons in project sidebar. | Douwe Maan | 2015-05-14 | 1 | -6/+0 |
| |/ / / / | |||||
| * | | | | Merge branch 'rs-relative-link-filter' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -85/+94 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Minor RelativeLinkFilter cleanup See merge request !649 | ||||
| | * | | | | Minor RelativeLinkFilter cleanuprs-relative-link-filter | Robert Speicher | 2015-05-13 | 3 | -85/+94 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-05-14 | 6 | -32/+33 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'fix-group-mention' into 'master' | Dmitriy Zaporozhets | 2015-05-14 | 3 | -3/+4 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654 | ||||
| | | * | | | Add changelog item.fix-group-mention | Douwe Maan | 2015-05-14 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Fix mentioning of private groups. | Douwe Maan | 2015-05-14 | 2 | -3/+3 |
| | | | |/ | | |/| | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |