Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-05ink to configured gravatar host on profile pageBen Bodenmiller
2015-08-04Merge branch 'rs-fix-rouge-inline-theme' into 'master' Stan Hu
Fix the `inline_theme` option for the Rouge formatter See merge request !1083
2015-08-04Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-08-04Merge branch 'update-mr-branch-text' into 'master'Douwe Maan
Update merge request text to reflect editability of source/target branch Screenshot 1 (source branch deleted): ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/81dfbc4c790a1bb047d60cd4699bb71f/image.png) Screenshot 2 (target branch deleted): ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/acec96c12d40175301ce4d4405137348/image.png) Closes #2134 See merge request !1085
2015-08-04Merge branch 'add-user' into 'master' Job van der Voort
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
2015-08-04typokaren Carias
2015-08-04text fixedkaren Carias
2015-08-03Update merge request text to reflect editability of source/target branchStan Hu
Closes #2134
2015-08-03Link to admin raketaskSytse Sijbrandij
2015-08-03Merge branch 'add-license'Dmitriy Zaporozhets
2015-08-03Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-08-03Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2015-08-03Merge branch 'redis-store' into 'master' Kamil Trzciński
Bump redis-store to 1.1.6 and remove redis-store-fix-expiry According to this https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.6 and my manual tests the monkey patch for redis-store is no longer required /cc @jacobvosmaer @rspeicher See merge request !1081
2015-08-02Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu
2015-08-02Merge pull request #9520 from gipcompany/annotate-models-updateStan Hu
Re-annotate models
2015-08-02Re-annotate modelsAtsushi Ishida
2015-08-02Fix the `inline_theme` option for the Rouge formatterRobert Speicher
2015-08-01Merge branch 'rs-code-links' into 'master' Douwe Maan
Make `code` elements in links display as such When a link consisted only of an inline code block -- ```[`like this`](https://google.com/)``` -- it was hard to tell that it was even a link. Before: > ![Screen_Shot_2015-07-31_at_5.45.06_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/eda0a0630024d461c8de151d06e9f4db/Screen_Shot_2015-07-31_at_5.45.06_PM.png) After: > ![Screen_Shot_2015-07-31_at_5.43.15_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9542c49cfb4d43c015d464ef0ba0440f/Screen_Shot_2015-07-31_at_5.43.15_PM.png) See merge request !1082
2015-08-01Make `code` elements in links display as suchRobert Speicher
Also adds some minor padding to inline `code` elements.
2015-07-31Merge branch 'api-useremails' into 'master' Robert Speicher
Add ability to manage user email addresses via the API. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181 See merge request !1066
2015-07-31Fix indentationDouwe Maan
2015-07-31Merge branch 'add-mr' into 'master' Job van der Voort
New doc about creating a Merge Request in GitLab Basics Added new doc about creating a new branch. See merge request !1917
2015-07-31small changeskaren Carias
2015-07-31Bump redis-store to 1.1.6 and remove redid-store-fix-expiryKamil Trzcinski
2015-07-31Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan
Mention group and project names in flash messages upon create, update and delete. Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency. **Before** ![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png) **After** ![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png) See merge request !1070
2015-07-31Merge branch 'admin-group-member' into 'master' Douwe Maan
Add specific ability for managing group members To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue) See merge request !1059
2015-07-31Merge branch 'fix-multiline-comment-highlighting' into 'master'Douwe Maan
Fix multi-line syntax highlighting ### What does this MR do? This MR fixes multi-line syntax highlighting in the code views. HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. ### Why was this MR needed? The current styling was broken for a while. ### Screenshots Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/bbcb61760ab04a010aabc40942a2c0ba/image.png) After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/48f61c91b6fdd9c99cd7f3d214853141/image.png) ### What are the relevant issue numbers? Closes #1577 Closes #1495 See merge request !1079
2015-07-31Merge branch 'master' into api-useremailsDouwe Maan
2015-07-31Merge branch 'master' into add-licenseDouwe Maan
2015-07-31Use before_actionsDouwe Maan
2015-07-31Fix multi-line syntax highlightingStan Hu
HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577
2015-07-31Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher
Add spec to RelativeLinkFilter for Unicode filenames Adds specs for changes added in !1050 See merge request !1078
2015-07-31Merge branch 'rs-markdown-feature-pipelines' into 'master' Robert Speicher
Prepare Markdown feature spec for testing multiple pipelines This MR lays the groundwork for including or excluding certain HTML::Pipeline filters depending on what we're parsing. For example, excluding reference filters in the Issues and Merge Requests titles. See merge request !1053
2015-07-31Merge branch 'api-new-attributes' into 'master' Robert Speicher
Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
2015-07-31Fix CHANGELOG entryRobert Speicher
2015-07-31Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher
2015-07-31Merge branch 'fix-image-file-is-not-displayed' into 'master'Robert Speicher
Update RelativeLinkFilter to support non-ASCII filenames See merge request !1050
2015-07-30added imagekaren Carias
2015-07-30added new doc about creating MRkaren Carias
2015-07-30Fix version for CHANGELOG entryStan Hu
2015-07-30typokaren Carias
2015-07-30added new doc about adding users and memberskaren Carias
2015-07-30Merge branch 'backup-directory-permissions' into 'master' Stan Hu
Backup directory permissions This sidesteps problems with running 'chmod' on some CIFS mounts. Closes #1704 https://gitlab.com/gitlab-org/gitlab-ce/issues/1704 See merge request !1065
2015-07-30Merge branch 'fix-rake-check-hooks' into 'master'Jacob Vosmaer
Check that hooks directory exists before attempting to call realpath This MR checks that the hooks directories actually exist before attempting to resolve their `realpath`. Users who attempted to restore from source to an omnibus installation would get ugly errors when running `gitlab-rake gitlab:check`: ``` Errno::ENOENT: No such file or directory @ realpath_rec - /var/opt/gitlab/git-data/repositories/Wanda/www.git/hooks /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `realpath' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `block in check_repos_hooks_directory_is_link' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block (2 levels) in find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block in find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:126:in `find_in_batches' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:51:in `find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/querying.rb:9:in `find_each' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:482:in `check_repos_hooks_directory_is_link' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:343:in `block (3 levels) in <top (required)>' Tasks: TOP => gitlab:check => gitlab:gitlab_shell:check ``` Closes #2121 #2082 See merge request !1068
2015-07-30Check that hooks directory exists before attempting to call realpathStan Hu
Closes #2121
2015-07-30Fix method name.Douwe Maan
2015-07-30Show buttons to add license, changelog and contribution guide if they're ↵Douwe Maan
missing.
2015-07-30Raise alert when group is deleted.Achilleas Pipinellis
This change was made to match the project deletion.
2015-07-30Fix ProjectDouwe Maan
2015-07-30No more web urlDouwe Maan