| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Improve header with avatar for group and user pages
Nice looking and aligned headers for user and group pages
See merge request !412
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Location field in user profile
Twitter allows you to set string with location information.
I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things.
See merge request !411
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
Change the name of the key used for bitbucket importer.
See merge request !1733
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Link to CI with ref
gitlab/gitlab-ci#162
!!! Should be merged simultaneously with https://dev.gitlab.org/gitlab/gitlab-ci/merge_requests/129
See merge request !1638
|
| | | | | |
|
| | | | | |
|
| | |/ /
|/| | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix commits routing for branches with slash
Fixes https://github.com/gitlabhq/gitlabhq/issues/8990
See merge request !408
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make issue and merge request sidebar more compact
* move votes block to participants
* make smaller font in sidebar
* remove js for upvoting since it differs from logic on backend and does not work correctly
Fixes #1253
Tested on different screens: HD, 1366x768, 1024x600
See merge request !410
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* move votes block to participants
* make smaller font in sidebar
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Update merge_status state to allow more transitions
Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.
Spec and Spinach tests have been run locally and all pass.
See merge request !405
|
| | | | |/
| | |/|
| | | |
| | | | |
Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.
|
| |/ / / |
|
| | |/
|/| |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
[security] gems update
[doorkeeper] added filtering of sensitive information (like secret key) from production.log
[gollum lib] remote code execution (in search field). We don't have search for wiki but it is better to have this fix.
Nothing critical!!!
related to #2143
See merge request !1732
|
| | | | |
|
| |/ / |
|
| | |
| |
| |
| |
| | |
This reverts commit 00607d4f960631f7396ea9afd39859d17fa9f12c, reversing
changes made to edfc7d0d268b6e73a30f501c3897965c111c262a.
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
New branch
See merge request !406
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | | |
Add error message when have error on profile screen
|
| |/ / / |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Revert "Increase timeout for Git-over-HTTP requests."
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.
For #2164
cc @marin @douwe
See merge request !1730
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.
Conflicts:
Gemfile
|
| |/ / /
| | |
| | |
| | | |
This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove mention of branch to commit to when new file is added through UI
See merge request !1731
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix cross-references that contain underscores
### What does this MR do?
Cross-references that contain underscores confuse the Markdown renderer and don't work properly. For example:
1. In `myacct/project_one#456`, add a comment that includes a reference to `myacct/project_two#123`.
2. The comment in `myacct/project_one#456` links correctly.
3. The system note in `myacct/project_two#123` is incorrectly linked as:
`mentioned in issue myacct/projectone#456_`
This MR removes the use of the `_` character in the system notes to prevent Markdown confusion.
See a full discussion in #1160.
### Are there points in the code the reviewer needs to double check?
To preserve backwards compatibility with existing system notes, there is a SQL wildcard match for notes having underscores. This seemed safer than migrating all notes.
### Why was this MR needed?
In an ideal world, the Markdown parser would be able to handle references containing underscores with or without escape sequences. However, there are a number of issues:
1. RedCarpet's parser for emphasis block is pretty dumb: it treats `#` as a word break and thus even the `intra_word_emphasis` flag has no effect.
2. The parser is in C and can't be changed easily.
3. There is no way to insert an escape sequence for emphasis blocks.
The only way around this is to switch to something like CommonMark, which does support escape sequences.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
Issue #1160
### Screenshots
Before:
After:
See merge request !385
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
underscores.
Remove emphasis from system notes to avoid Markdown conflicts in names.
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Update poltergeist to support phantomjs 2.0
In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).
Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.
See merge request !403
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixed rake task gitlab:cleanup:block_removed_ldap_users
Maybe not the most elegant solution, but it works for us.
This closes issue gitlab-org/gitlab-ce#955.
See merge request !338
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | | |
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
Fix small grammar issue on projects show page
|
| | | | | | | | | |
|
