| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Closes #1721
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/profiles/accounts/show.html.haml
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
You can not remove user if he/she is an only owner of group
To prevent loose of group data you need to transfer or remove group
first before you can remove user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !730
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
To prevent loose of group data you need to transfer or remove group
first before you can remove user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix git blame syntax highlighting when different commits break up lines
### What does this MR do?
This MR fixes a bug where syntax highlighting would not work properly in certain lines when doing a `git blame` view of a file. Also, this MR reuses the Rugments lexer and formatter for each `git blame` commit block, which should make things faster and reduce overhead.
### Why was this MR needed?
When doing a `git blame`, GitLab feeds the Rugments lexer/formatter blocks of code based on the latest commit for each line. However, this can cause lexer to fail because the state is cleared between each block of code, which causes `highlight` to fallback to the plaintext lexer. For example, notice this unhighlighted line in [this file](https://gitlab.common-lisp.net/cmucl/cmucl/blame/master/src/assembly/assemfile.lisp):
The fixed version looks like this:
This MR requires a patch to rugments to allow the `continue` option to be passed to the lexer.
* https://github.com/rumpelsepp/rugments/pull/24
* https://github.com/rumpelsepp/rugments/pull/23
* Also submitted to rouge: https://github.com/jneen/rouge/pull/267
### What are the relevant issue numbers?
Closes #1521
See merge request !697
|
| | |/ /
| | |
| | |
| | | |
Closes #1521
|
| |\ \ \
| |_|/
|/| | |
Some language improvements
|
| | |/ |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Persist current merge request tab selection via URL
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
See merge request !728
|
| | |/
| |
| |
| | |
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change some header icons
icons changed:
* profile settings: user icon to cog
* admin area: cogs to wrench
Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290
See merge request !726
|
| | |
| |
| |
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix milestone "Browse Issues" button.
After refactoring around issue/merge requests filters, the button stopped working :(
See merge request !699
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
filter active.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix project snippets button appearing when it is disabled
There was a typo in 9bcd36396b9b that caused the project snippets option to be shown when it is disabled.
Closes #1705
See merge request !720
|
| | | |/
| |/|
| | |
| | | |
Closes #1705
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix clone URL losing selection after a single click in Safari and Chrome
### What does this MR do?
This MR deactivates the mouseup event in the `git clone` URL to prevent the text from being deselected after a single click.
### Why was this MR needed?
In Safari and Chrome 43.0.2357.65 (42.0.2311.152 worked fine), the URL would lose selection after a single click. To reproduce:
1. Go to https://gitlab.com/gitlab-org/gitlab-ce
2. Click on the URL in the repository (HTTP is selected by default).
3. Click on the SSH button.
4. Click on the URL again.
The URL selection should be selected automatically, but it is deselected immediately.
It appears that 92544df changed the selection event from `click` to `focusin` to make copy & paste work in X11. This Stack Overflow article discusses the deselection issue in detail:
http://stackoverflow.com/questions/3380458/looking-for-a-better-workaround-to-chrome-select-on-focus-bug
### What are the relevant issue numbers?
Closes https://github.com/gitlabhq/gitlabhq/issues/9326
See merge request !698
|
| | | |
| | |
| | |
| | | |
Closes #9326
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add file attachment support in Milestone description
### What does this MR do?
This MR adds support for attaching files to Milestone descriptions.
### Why was this MR needed?
Dropzone support should be in every Markdown area. It seems that this one was overlooked.
### What are the relevant issue numbers?
Closes #1648
See merge request !712
|
| | | |
| | |
| | |
| | | |
Closes #1648
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Move user avatar and logout button to sidebar
Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !719
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Clarify navigation labels for Project Settings and Group Settings.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337.
See merge request !703
|
| | | |/ /
| |/| | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Group project contributions by both name and email.
See https://twitter.com/Argorain/status/598751646143897600.
We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph.
Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328.
See merge request !700
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Prefix EmailsOnPush email subject with `[Git]`.
Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2112.
See merge request !701
|
| | |/ / / / |
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.
See merge request !702
|
| | | | | | |
|
| | |/ / / |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add to_reference method to referable models
Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
See merge request !641
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
We only want them shortened by the filter, which calls to_s
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Except for Note, which still overrides it.
|
| | | | | | |
|
