| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update merge request text to reflect editability of source/target branch
Screenshot 1 (source branch deleted):
Screenshot 2 (target branch deleted):
Closes #2134
See merge request !1085
|
| | |
| |
| |
| | |
Closes #2134
|
| |\ \
| |/
|/| |
|
| | |\ |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
missing.
|
| |\ \ \ |
|
| | | | | |
|
| |/ / /
| | |
| | |
| | | |
Also adds some minor padding to inline `code` elements.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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**
**After**
See merge request !1070
|
| | | | |
| | | |
| | | |
| | | | |
This change was made to match the project deletion.
|
| | | | | |
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
reason
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | |\ \ \ |
|
| | | | | | |
|
| | | |/ /
| |/| |
| | | |
| | | | |
attributes to API
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix network graph when branch name has single quotes
## Steps to reproduce
1. Create a branch with a single quote in the branch name: "`test`"
2. Look at Project's Network view
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
See merge request !1063
|
| | | |_|/
| |/| |
| | | |
| | | | |
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Switched the order of the SSH key form
Now it looks like this:
See merge request !1069
|
| | | | | | |
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
import:repos task
Add gitlab-shell to error message to give user a clue that something may be wrong there.
Ran into this in #2082. User was told that repositories were created when they were
not due to hooks symlink being wrong.
|
| | |_|/
|/| |
| | |
| | | |
- Updated CHANGELOG
|
| |\ \ \
| | | |
| | | | |
Switch back to rouge gem for synthax highlighting
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This custom formatter for rouge is needed to generate HTML output
specifically for gitlab. Since its usecase is mostly suitable for
gitlab it had been rejected upstream:
https://github.com/jneen/rouge/pull/268
Thanks a lot to @stanhu, @jneen and @tsigo for review!
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
I have mainly created the rugments fork for the purpose of improving
gitlab's highlighting. Nowadays IMO it works way better than the old
highlight.js solution. But the development is stuck on my side because
of a couple of personal reasons:
* I have finished my studies; last months I was writing my master
thesis. So there was a huge time problem. I am sorry for that.
* I had to move to Munich due to getting a (paid) job. Searching a
flat here is horrible... :)
* Last but not least, maintaining the same code base in two seperate
projects is a mess.
I have decided to switch back to rouge due to several reasons:
* In the beginning I was quite motivated, but since I start
working on my new job next week, the best solution IMO is
switching back to upstream rouge.
* Rouge is continously improving:
https://github.com/jneen/rouge/blob/master/CHANGELOG.md
http://rouge.jneen.net/
* There should be absolutely no regressions with this change. Most
likely this pull request will almost fix some minor bugs.
* One less gem in gitlab is a good thing. since Gitlab is quite a
huge bundle of gems. Reducing complexity should be a major
milestone.
Thanks a lot to @stanhu and @jneen for the review!
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make `hr`s more visible in note bodies
Closes #2107
See merge request !1054
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Closes #2107
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix bug causing Bitbucket importer to crash when OAuth application
had been removed.
Fixes gitlab-com/support-forum#241.
See merge request !1057
|
| | | |_|/
| |/| |
| | | |
| | | | |
removed.
|
| |\ \ \ \
| |/ / /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Added a timestamp to the wikis page just below the title
Now it looks like this:
See merge request !1055
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix commit data retrieval when branch name has single quotes
Quotes in ref names need to be escaped properly in JavaScript.
Closes #1724
See merge request !1046
|
| | | | |
| | | |
| | | |
| | | | |
Closes #1724
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Render Note field hints consistently for "new" and "edit" forms
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
didn't.
Closes #2010
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
See merge request !1049
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
didn't.
Closes #2010
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Create project services on Project creation
Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354
See merge request !1045
|
| | | | | |
|
| | |/ /
|/| | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix the "Reload with full diff" URL button
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode.
Closes #2041
See merge request !1019
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.
Closes #2041
|
