Age | Commit message (Collapse) | Author |
|
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
`path_with_namespace` and `default_branch` in `project` in push, issue,
merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
favor of `git_http_url` in `project` for push, issue, merge-request and
note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
note webhooks data, use `project` instead
|
|
|
|
Replaces "Create merge request" link with one to the MR when one exists
Fixes #3716
* Without MR:
![before-1](/uploads/abcb2eb5bb5927a83c2f1700528f852c/before-1.png)
* With MR:
![after-1](/uploads/9020b871e1aa08d3e5a45359336ef0f2/after-1.png)
* Without MR:
![before-2](/uploads/bb3bd1a74efc193ad31af68f1e04ef5f/before-2.png)
* With MR:
![after-2](/uploads/789d32aef12f39c605e665d0c4bc9fbe/after-2.png)
* Without MR:
![before-3](/uploads/a9aff7a11eb1069be24c37a5455be809/before-3.png)
* With MR:
![after-3](/uploads/48fe81ea50657fe5b2de0d25260d8e4b/after-3.png)
See merge request !2670
|
|
|
|
'master'
Add assignee data to Issuables' hook_data
Originally opened at !1633 by @brammeleman.
Fixes #3047. Fixes #2475.
See merge request !2724
|
|
Actually use the `skip_merges` option in Repository#commits
Originally opened at !2067 by @cwq1913.
See merge request !2750
|
|
|
|
|
|
[ci skip]
|
|
Expose MergeRequest#merge_status
_Originally opened at !2478 by @develop7._
- - -
This enables API users to see whether a merge request can be merged without conflicts.
See merge request !2756
|
|
|
|
'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master'
Add option to include the sender name in body of Notify email
_Originally opened at !2495 by @huacnlee._
- - -
Fixes #7824.
See merge request !2767
|
|
Add an option to supply root email through an environmental variable.
_Originally opened at !2499 by @3kami3._
---
Add an option to supply root email through an environmental variable.
See merge request !2751
|
|
|
|
|
|
Allow limited Markdown in Broadcast Messages
Closes #11853
See merge request !2695
|
|
|
|
Increase project import timeout from 4 minutes to 15 minutes
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.
Fixes gitlab-org/gitlab-ee#246
## Import screenshot
![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png)
See merge request !2717
|
|
|
|
|
|
See merge request !2752
|
|
Fixed init.d script not working on OS X
-s flag of su doesn't work correctly on OS X, logging in as the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
Fixes Issue #3309
See merge request !1728
|
|
|
|
resource
|
|
-s flag of su doesn't work correctly on some systems, loging in the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
|
|
This caches the output of the following methods:
* Repository#empty?
* Repository#has_visible_content?
* Repository#root_ref
The cache for Repository#has_visible_content? is flushed whenever a
commit is pushed to a new branch or an existing branch is removed.
The cache for Repository#root_ref is only flushed whenever a user
changes the default branch of a project. The cache for Repository#empty?
is never explicitly flushed as there's no need for it.
|
|
Remember user's inline/tabular diff view preference in a cookie
_Originally opened at !1677 by @kkm._
---
As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie.
Fixes #3071.
See merge request !2723
|
|
Fixes #3903
|
|
|
|
[ci skip]
|
|
Closes #11853
|
|
[ci skip]
|
|
Fixes for issue with poor logo transition animation on Safari
See merge request !2690
|
|
updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors
Updated comments and Changelog
Removed duplicate line in changelog
|
|
|
|
|
|
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.
Fixes gitlab-org/gitlab-ee#246
|
|
You can set type: :merge_request to create a link to merge request
lists instead of issues list. Accept both Symbol & String as type
argument for the link_to_label helper
|
|
Fix atom url issue on projects
This MR adds prevents a project to have a path ending in .atom that conflicts with the feed
and
Adds a migration to migrate old .atom projects to a different path
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699
See merge request !2651
|
|
|
|
Support Two-factor Authentication for LDAP users
Closes #12653
See merge request !2688
|
|
|
|
Hide remove source branch button when new commit is added to branch
Fixes #3339
This MR hides the 'Remove source branch' button when a new commit is added to the source branch
/cc @DouweM
See merge request !2701
|
|
For big instances search autocomplet is flooded with groups you have no
access to and insternal/public projects you don't care. It affects way
how easily you can go to group/project you are actually member of
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Fixes #3339
This MR hides the 'Remove source branch' button when a new commit is added to the source branch
|
|
No space required after WIP identifier
Fixes #2426
Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging.
To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap").
See merge request !1876
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Closes #12653
|
|
Improve UI consistency between projects and groups lists
* add group description to the list
* move new group button to top nav
* move projects/users count icons to the right
Fixes #3939
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2677
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|