summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Use pre-wrap for diff code in discussion viewVinnie Okada2015-03-141-0/+5
| |/ / / / |/| | | |
* | | | | Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-143-9/+9
|\ \ \ \ \
| * | | | | Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-143-9/+9
| | | | | |
* | | | | | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-142-25/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restyle import Render import providers in one line and make it buttons See merge request !1699
| * | | | | Improve import buttons on new project pageDmitriy Zaporozhets2015-03-142-25/+23
| | | | | |
* | | | | | Improve compare switch buttonDmitriy Zaporozhets2015-03-141-7/+1
| | | | | |
* | | | | | Refactor buttonsDmitriy Zaporozhets2015-03-1448-106/+92
|/ / / / /
* | | | | Use sass variabled for backgroung and border colorsDmitriy Zaporozhets2015-03-139-25/+33
| | | | |
* | | | | Improve css for file actionsDmitriy Zaporozhets2015-03-138-36/+43
| | | | |
* | | | | Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets2015-03-134-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor cleanup around UTF-8 encoding. Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in. See merge request !1642
| * | | | | Reuse blob object fetched by Gitlab::Git::Blame.Douwe Maan2015-03-131-2/+2
| | | | | |
| * | | | | Everything from gitlab_git is already UTF-8.Douwe Maan2015-03-133-5/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'tag-branch-hooks' into 'master'Dmitriy Zaporozhets2015-03-138-44/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execute hooks and services when branch or tag is created or deleted through web interface. Fixes #2095. Split up into commits to make it easier to see why what was changed :) See merge request !1692
| * | | | | Move tag deletion to service and execute hooks and services.Douwe Maan2015-03-132-6/+47
| | | | | |
| * | | | | Ecevute hooks and services when branches are created/deleted through web.Douwe Maan2015-03-132-0/+5
| | | | | |
| * | | | | More consistent method naming.Douwe Maan2015-03-132-5/+8
| | | | | |
| * | | | | Use PushDataBuilder where applicable.Douwe Maan2015-03-134-27/+22
| | | | | |
| * | | | | Set push data object kind in PushDataBuilder.Douwe Maan2015-03-132-6/+2
| |/ / / /
* | | | | Use custom LDAP label in LDAP signin form.Douwe Maan2015-03-132-4/+4
|/ / / /
* | | | Merge branch 'irker-service-use-supported-events' into 'master'Drew Blessing2015-03-131-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Irker service check supported_events 63178a9509f72eb7adf1c73c2fc6dc1ec0a1ea42 added the supported_events check for services. Since f84b7eef3f969a65d0930c9d62b6968b2ae70f12 was just added, we should adjust it accordingly. See merge request !367
| * | | | Make Irker service use the supported events checkStan Hu2015-03-041-2/+8
| | | | |
* | | | | Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets2015-03-1229-44/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/merge_requests_controller.rb
| * \ \ \ \ Merge branch 'default-pagination' into 'master'Dmitriy Zaporozhets2015-03-1219-27/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use same constant for amount of items per page See merge request !1689
| | * | | | | Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-1219-27/+29
| | | | | | |
| * | | | | | Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-128-15/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent database query each time we render group avatar Fixes #2118 See merge request !1688
| | * | | | | | Prevent database query each time we render group avatarDmitriy Zaporozhets2015-03-128-15/+18
| | |/ / / / /
| * | | | | | Merge branch 'replace_passwords_with_asterisk' into 'master'Marin Jankovski2015-03-122-2/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Show asterisks instead of password in service edit form. See merge request !1686
| | * | | | | Show asterisks instead of password in service edit form.Marin Jankovski2015-03-122-2/+12
| | | | | | |
* | | | | | | Implement merge requests searchDmitriy Zaporozhets2015-03-128-35/+78
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-124-3/+28
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'fix_email_images' into 'master'Douwe Maan2015-03-124-3/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix email images ## Dependencies: This MR Depends on gitlab-org/html-pipeline-gitlab!4 being **merged and published** to rubygems.org ## What does this MR do? This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8. The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client. The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails. I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues. @DouweM can you review this please? Closes #1161 See merge request !373
| | * | | | | replace images in emails with inline imagesHannes Rosenögger2015-03-124-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the functionality of replacing all images that were uploaded to gitlab with inline images(base64) in emails. This change fixes the broken images in emails that 7.8 introduced
* | | | | | | Merge branch 'improve-import-page' into 'master'Dmitriy Zaporozhets2015-03-126-9/+56
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Style improvements to import page See merge request !1685
| * | | | | | Style improvements to import pageDmitriy Zaporozhets2015-03-126-9/+56
| |/ / / / /
* | | | | | Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing GitHub organisation repositories on import page. Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this. cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9. See merge request !1683
| * | | | | | Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'blue-theme' into 'master'Dmitriy Zaporozhets2015-03-123-0/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add blue theme to GitLab See merge request !1682
| * | | | | | Add blue theme to GitLabDmitriy Zaporozhets2015-03-113-0/+15
| | | | | | |
* | | | | | | Merge branch 'hover_toggle_sidebar'Marin Jankovski2015-03-121-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
| * | | | | | | Reverting pixel changeSabba Petri2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breaks navbar
| * | | | | | | Fixed up app_logoSabba Petri2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pixel perfection.
| * | | | | | | Added hover stateSabba Petri2015-02-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And also fixed it being one pixel off.
* | | | | | | | group controller refactoringValery Sizov2015-03-123-14/+12
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'markdown-smb-link' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow smb:// links in Markdown text. As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184 See merge request !1669
| * | | | | | Allow smb:// links in Markdown text.Douwe Maan2015-03-101-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' into new-emojiDmitriy Zaporozhets2015-03-111-6/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | | | | | | Remove annoying notice messages when create/update merge requestDmitriy Zaporozhets2015-03-111-6/+2
| | | | | | | |
* | | | | | | | Update html-pipeline and emojiDmitriy Zaporozhets2015-03-111-4/+4
|/ / / / / / /
* | | | | | | Merge branch 'fix-code-preview' into 'master'Marin Jankovski2015-03-117-2/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code preview theme setting for comments, issues, merge requests, and snippets User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme. Closes #1139 See merge request !357
| * | | | | | | Fix code preview theme setting for comments, issues, merge requests, and ↵Stan Hu2015-03-107-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snippets. Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
View Lorry Controller Status