c3b81e5f40
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-10-21 11:44:18 +03:00
5ed7c20150
Prevent 500 error when filter projects with push in admin area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-20 17:22:39 +03:00
f808ecf11e
DRY mentioned in magic note constant
2014-10-19 22:19:56 +02:00
6c0994a3b3
Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers
...
Conflicts:
app/controllers/omniauth_callbacks_controller.rb
2014-10-13 17:07:53 +02:00
05fca6bfc2
Merge branch 'sorting-users-in-admin' into 'master'
...
Sorting users in admin
See merge request !1170
2014-10-13 13:59:17 +00:00
4e0da2325b
Admin: user sorting
2014-10-13 16:07:57 +03:00
a7e071e982
Add refactoring for multiple LDAP server support
...
These changes are ported from EE to CE. Apply changes for app directory
2014-10-13 13:39:54 +02:00
8c01448cf9
Dontr decoarate already decorated stuff
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 17:39:29 +03:00
ea04ed7879
Use 8chars short sha for commit in views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 16:30:14 +03:00
daa55f31d8
Dont raise exception when wrong commit id passed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:58:11 +03:00
200118357d
Use full commit sha width for reference in note body to prevent Ambiguous SHA1 prefix problem
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:44:27 +03:00
0189be0831
Use short_id instead of [0..N] for short version of commit sha
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
82c938ad75
annotate
2014-10-09 18:22:20 +03:00
47f539f5a6
Snippets: public/internal/private
2014-10-09 17:09:53 +03:00
4c7da578f2
Merge branch 'master' into buildbox-service
...
Conflicts:
app/models/project.rb
2014-10-08 16:33:53 +08:00
76594d474c
Added support for Buildbox
2014-10-08 16:30:04 +08:00
c0306f78d2
Merge branch 't1254-snippets-refactoring' into 'master'
...
Snippets refactoring: rename public to internal. STEP 1
See merge request !1157
2014-10-07 10:05:59 +00:00
7bcd6f79a4
Merge pull request #7963 from cirosantilli/factor-previewable
...
Factor markup? || gitlab_markdown? into new method
2014-10-07 12:19:28 +03:00
fd8d1d9b62
Snippets: rename public to internal
2014-10-07 11:54:00 +03:00
70004f4ef6
Merge branch 'slack_integration' into 'master'
...
Slack integration
See merge request !1151
2014-10-06 16:14:48 +00:00
0fed1b5876
Merge pull request #7964 from mr-vinn/task-lists
...
Add task lists to issues and merge requests
2014-10-06 17:29:06 +02:00
46b7a3f8f5
Prevent PG::Error exception when check commit reference on commit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-06 15:07:36 +03:00
e5998adc26
Accommodate new webhook url format.
2014-10-06 10:44:01 +02:00
2017977214
Use only webhook for slack service integration.
2014-10-06 10:44:01 +02:00
9f0083a96c
Add task lists to issues and merge requests
...
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input. Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks. Task status is also displayed in the MR and issue
lists.
2014-10-05 22:15:27 -05:00
07e9cb6b77
Factor markup? || gitlab_markdown? into new method
2014-10-04 17:56:12 +02:00
088987e2dd
Make Mentionables work for cross-project refs
...
Add a note to merge requests and issues when they're mentioned by a
merge request, issue, or commit in another project.
2014-10-03 12:30:20 -05:00
2c46c4523f
Track projects in ReferenceExtractor
...
Store both the project and identifier of extracted references. This
prevents `ReferenceExtractor` from returning objects in the wrong
project for cross-project references.
2014-10-03 12:30:20 -05:00
d1fa3b336d
Add Pushover service integration
...
That introduce select field type for services options.
2014-10-03 13:54:37 +02:00
ac6f032122
Merge pull request #7779 from Bugagazavr/hook_tag_push_events
...
Add tag push events to project hook api
2014-10-03 13:38:56 +03:00
03b44916ba
Merge pull request #7754 from Bugagazavr/hooks
...
More information in merge request hook
2014-10-03 13:37:19 +03:00
2e9f5de868
Add parenthesis to function def with arguments.
2014-10-03 09:18:46 +02:00
b4963e9dda
Add tag_push_events to project hook api
2014-10-03 10:23:32 +04:00
8e33f9460c
Show test coverage results in MR if available
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 18:17:47 +03:00
c6f3f9bb33
Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/merge_requests/_form.html.haml
2014-10-02 12:50:29 +03:00
1c9d2e39c1
Hook attributes
2014-10-02 12:58:02 +04:00
adc84bf8b4
Merge pull request #7906 from mr-vinn/fix-graph-log
...
Replace Gitlab::Git::GitStats
2014-09-30 12:19:05 +03:00
e145f46a93
Fix contributors api
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-30 11:56:48 +03:00
31abf76840
Replace Gitlab::Git::GitStats
...
The `GitStats` class has been removed from gitlab_git, so parse commits
directly in `Repository#graph_log`.
2014-09-29 22:58:21 -05:00
51f8352dca
Keep tmp/repositories during clean-up
2014-09-29 17:02:45 +02:00
88b1e0ffcd
Faster branch contains detection for commit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-29 16:40:13 +03:00
44bc5fe5d6
Improve commits data loading on Tree page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-29 14:40:36 +03:00
20e0c9b132
Rewrite graphs feature
...
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-26 18:04:41 +03:00
16d530b7b0
Sort projects in search autocomplete by amount of stars. Most popular go first
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 19:41:49 +03:00
3a106cbcd3
Fix graphs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 15:06:41 +03:00
4b65b0e0f5
Fix wiki
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 13:56:23 +03:00
b13c1469a3
Rollback diff drop and set default commit id to HEAD
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 12:46:30 +03:00
3695ae185b
Decorate commit parents
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 12:19:26 +03:00
d0e3ab5826
Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting
2014-09-23 21:35:45 +03:00
a5d23ae3c8
Fix MR commenting system when new commits pushed
...
This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.
Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
2014-09-23 14:20:21 +03:00
Dmitriy Zaporozhets