| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | FogBugz project import | Jared Szechy | 2015-09-08 | 7 | -0/+30 | |
| | | | ||||||
| | * | Ordering of GitHub issues import is now fixed | Achilleas Pipinellis | 2015-08-31 | 1 | -1/+1 | |
| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab | |||||
| * | | Add documentation for ff-merge and rebase | Dmitriy Zaporozhets | 2015-09-07 | 6 | -6/+27 | |
| | | | ||||||
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-08-26 | 1 | -2/+2 | |
| |\ \ | |/ | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Merge branch 'fix' into 'master' | Job van der Voort | 2015-08-26 | 1 | -2/+2 | |
| | |\ | | | | | | | | | | | | | | | | | | | Fixed text about HTTP Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840 See merge request !1921 | |||||
| | | * | deleted line | karen Carias | 2015-08-17 | 1 | -2/+1 | |
| | | | | ||||||
| | | * | fixed text | karen Carias | 2015-08-10 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee | Dmitriy Zaporozhets | 2015-08-19 | 2 | -0/+41 | |
| |\ \ \ | |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 2 | -0/+41 | |
| | | | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | |||||
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-11 | 2 | -41/+0 | |
| | |\ \ | ||||||
| | | * | | Revert "Merge branch 'improve-merge-requests' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 2 | -41/+0 | |
| | | |/ | | | | | | | | | | | | | This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414. | |||||
| | * | | fixed conflict | karen Carias | 2015-08-10 | 1 | -10/+1 | |
| | | | | ||||||
| | * | | fixed conflict and comment | karen Carias | 2015-08-10 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fixed conflict and comment | karen Carias | 2015-08-10 | 1 | -3/+32 | |
| | |\ \ | | |/ | ||||||
| | * | | Info about not receiving emails | karen Carias | 2015-08-07 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge master from CE | Dmitriy Zaporozhets | 2015-08-17 | 3 | -42/+6 | |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-08-10 | 8 | -11/+95 | |
| |\ \ \ | | |/ | |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Merge branch 'merge-notifs' into 'master' | Robert Speicher | 2015-08-07 | 1 | -11/+28 | |
| | |\ \ | | |/ | |/| | | | | See merge request !1077 | |||||
| | | * | Merge branch 'master' into merge-notifsmerge-notifs | Douwe Maan | 2015-08-06 | 6 | -0/+26 | |
| | | |\ | ||||||
| | | * | | Update notification docs | Douwe Maan | 2015-08-06 | 1 | -11/+28 | |
| | | | | | ||||||
| | * | | | Link merge request doc to READMEimprove-merge-requests | Dmitriy Zaporozhets | 2015-08-07 | 2 | -1/+1 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | | Create ref for every merge request. Add documentation for fetch merge requests | Dmitriy Zaporozhets | 2015-08-07 | 1 | -0/+41 | |
| | | |/ | |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Merge branch 'add-user' into 'master' | Job van der Voort | 2015-08-04 | 6 | -0/+26 | |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | Added new doc about adding users and members Added new doc in workflow about how to add users and members and I also linked it to "permissions". See merge request !1916 | |||||
| | | * | typo | karen Carias | 2015-08-03 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | text fixed | karen Carias | 2015-08-03 | 1 | -7/+7 | |
| | | | | ||||||
| | | * | typo | karen Carias | 2015-07-30 | 1 | -7/+7 | |
| | | | | ||||||
| | | * | added new doc about adding users and members | karen Carias | 2015-07-30 | 6 | -0/+26 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee | Douwe Maan | 2015-07-31 | 3 | -6/+11 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge branch 'typo-corrections' into 'master' | Stan Hu | 2015-07-30 | 1 | -4/+4 | |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Minor styling fixes - Link to rendered html instead of markdown source. - Removed typos See merge request !1044 | |||||
| | | * | Minor styling fixes. | Arno Fleming | 2015-07-25 | 1 | -4/+4 | |
| | | | | | | | | | | | | | - Link to rendered html instead of markdown source. - Removed typos | |||||
| | * | | Merge branch 'doc-size' into 'master' | Job van der Voort | 2015-07-28 | 1 | -1/+4 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added info about repo size Because of tweet https://twitter.com/s_hulard/status/624160758335672320 See merge request !1912 | |||||
| | | * | | fixed text | karen Carias | 2015-07-27 | 1 | -1/+2 | |
| | | | | | ||||||
| | | * | | added info about repo size | karen Carias | 2015-07-23 | 1 | -1/+3 | |
| | | |/ | ||||||
| | * | | added note about labels in MR | karen Carias | 2015-07-23 | 1 | -1/+3 | |
| | |/ | ||||||
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee | Valery Sizov | 2015-07-28 | 11 | -24/+70 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee | Douwe Maan | 2015-07-23 | 2 | -5/+3 | |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # app/controllers/projects_controller.rb # db/schema.rb # doc/workflow/README.md # lib/gitlab/satellite/merge_action.rb | |||||
| | | * | fixed notifications title | karen Carias | 2015-07-13 | 2 | -5/+3 | |
| | | | | ||||||
| | * | | fix typo | Job van der Voort | 2015-07-17 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | new documentation on merge request approvals | Job van der Voort | 2015-07-17 | 10 | -19/+67 | |
| | | | | ||||||
| * | | | Fix typos | Stan Hu | 2015-07-20 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2015-07-02 | 1 | -0/+2 | |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION app/assets/javascripts/project_new.js.coffee app/helpers/appearances_helper.rb app/helpers/application_helper.rb app/helpers/groups_helper.rb app/helpers/oauth_helper.rb app/models/user.rb app/views/admin/application_settings/_form.html.haml app/views/layouts/nav/_group.html.haml app/views/layouts/nav/_project_settings.html.haml app/views/profiles/accounts/show.html.haml doc/integration/README.md features/steps/project/merge_requests.rb features/support/env.rb spec/controllers/import/github_controller_spec.rb spec/helpers/oauth_helper_spec.rb spec/lib/gitlab/ldap/access_spec.rb spec/lib/gitlab/upgrader_spec.rb spec/models/project_team_spec.rb spec/routing/admin_routing_spec.rb spec/services/git_push_service_spec.rb spec/services/test_hook_service_spec.rb | |||||
| | * | fixed phrase | karen Carias | 2015-06-25 | 1 | -1/+1 | |
| | | | ||||||
| | * | added info about EE | karen Carias | 2015-06-25 | 1 | -1/+1 | |
| | | | ||||||
| | * | added info about GitHub importing | karen Carias | 2015-06-24 | 1 | -1/+3 | |
| | | | ||||||
| * | | fixed word | karen Carias | 2015-06-25 | 1 | -1/+4 | |
| | | | ||||||
| * | | added info about GitHub EE | karen Carias | 2015-06-25 | 1 | -3/+2 | |
| | | | ||||||
| * | | added info to groups doc | karen Carias | 2015-06-22 | 1 | -0/+14 | |
| | | | ||||||
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee | Dmitriy Zaporozhets | 2015-06-17 | 5 | -79/+15 | |
| |\ \ | |/ | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb doc/README.md doc/install/installation.md doc/update/6.x-or-7.x-to-7.12.md doc/workflow/README.md | |||||
| | * | added info about migrating to gitlab.com | Karen Carias | 2015-06-17 | 1 | -0/+3 | |
| | | | ||||||
| | * | Move 2FA docs from "Workflow" to "Profile Settings" | Robert Speicher | 2015-06-13 | 4 | -83/+15 | |
| | | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |