7486bc0ae3
Update Dockerfile for GitLab 7.8.1
2015-03-01 09:40:04 +01:00
8aabb58d5b
Merge pull request #8757 from bbodenmiller/patch-1
...
formatting cleanup on mysql_to_postgresql.md
2015-02-28 23:14:08 +01:00
3678b64b4a
Merge pull request #8758 from bbodenmiller/patch-3
...
use gitlab branch of mysql-postgresql-converter
2015-02-28 23:13:08 +01:00
e45811c12e
Merge pull request #8803 from Bugagazavr/patch-2
...
Correct json payload [ci skip]
2015-02-28 23:05:27 +01:00
66a82fd8da
Merge pull request #8858 from Razer6/update-version-sorter
...
Update version sorter to 2.0.0, fixes #8572
2015-02-28 22:52:04 +01:00
82a9a4c034
Merge pull request #8882 from Shine-neko/master
...
Fix typo
2015-02-28 07:48:46 +01:00
c85935c42a
Merge branch 'mmonaco/gitlab-ce-api-user-noconfirm' into 'master'
...
Add 'confirm' option to users api
For #1990
Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/129
See merge request !1610
2015-02-27 22:59:44 +00:00
9e4d3f328f
fix typo
2015-02-27 22:49:40 +01:00
0d22b75b03
Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm
...
Conflicts:
lib/api/users.rb
2015-02-27 13:01:57 -08:00
1aa08c2d80
Merge branch 'update_release_documentation' into 'master'
...
Remove CI sections related to release tool, update steps in monthly and patch release documentation.
See merge request !1608
2015-02-27 18:43:55 +00:00
3e6b342a1a
Remove CI sections related to release tool, update steps in monthly and patch release documentation.
2015-02-27 10:38:15 -08:00
ada7d0f393
Merge branch 'update_update_project_milestone_path' into 'master'
...
Update project_milestone_path update route.
See merge request !1605
2015-02-27 17:41:04 +00:00
14d8e2b058
Merge branch 'redirect-old-note-attachments-url' into 'master'
...
Redirect old note attachment path to new uploads path.
See 0d884ff2b1 (note_891797)!1607
2015-02-27 17:11:39 +00:00
d4aab6528c
Merge branch 'fix-user-contributed-projects' into 'master'
...
Fix and test user contributed projects.
Fixes #2077 .
See merge request !1606
2015-02-27 16:35:29 +00:00
7202db072f
Redirect old note attachment path to new uploads path.
2015-02-27 11:26:47 +01:00
804a2488cf
Fix and test User#contributed_projects_ids.
2015-02-27 10:49:47 +01:00
47c5a2ab22
Merge branch 'autocomplete-mention-count' into 'master'
...
Include number of affected people in all/group mention autocomplete item.
As mentioned in #2054 .
To minimize misuse of all/group mentions, the autocomplete title includes the number of members this mention will notify, so users will be more considerate what groups they mention.
Example:
at-all "**all** All Project and Group Members (12)"
at-gitlab "**gitlab** GitLab (12)"
See merge request !1596
2015-02-27 07:08:23 +00:00
42387b733b
Merge branch 'route-helper' into 'master'
...
Introduce shortcuts for routing helpers
See merge request !1600
2015-02-27 07:03:01 +00:00
6ac0a0217c
Fix syntax issue
2015-02-26 16:44:52 -08:00
62a81494ba
Update project_milestone_path update route.
2015-02-26 16:03:42 -08:00
5bf492fe1f
Merge branch 'filter_icons_btn' into 'master'
...
Filter icons look like proper buttons
The filter icons (Push events, Merge events, Comments, Team) now have a border
that signifies they can be pushed. This not only keeps it in line with the rest
of the application buttons, but it makes it more obvious, especially for the
Merge events button with a checkbox icon.
Fixes #1993
See merge request !1576
2015-02-26 19:44:46 +00:00
fc7f3bf8a1
Merge branch 'small_profile_changes' into 'master'
...
Fixes grammatical consistency and small changes
This commit adds consistency to small things like periods, commas,
and gives additional information to buttons and headers, etc.
Fixes #2002 , #2005 , #2003 .
See merge request !1570
2015-02-26 19:38:24 +00:00
6146e2940d
Merge branch 'event_tooltip_addition' into 'master'
...
Added information to tooltips
Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992
See merge request !1571
2015-02-26 18:50:23 +00:00
f05168b1a1
Merge branch 'import-status-page-link' into 'master'
...
Fix import status page project links for new Rails.
Fixes #2059 .
See merge request !1593
2015-02-26 17:40:06 +00:00
386178aedf
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-02-26 09:36:43 -08:00
b510223e7f
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper
2015-02-26 09:34:35 -08:00
6de4e4a622
Include route helper shortcut in controller
2015-02-26 09:34:20 -08:00
01660f0d6d
Merge branch 'z_index_for_sticky_header' into 'master'
...
Add z index for diff header so sticky header stays on top on diff comments.
See merge request !1603
2015-02-26 17:33:03 +00:00
faae454424
Merge pull request #8869 from tsigo/rs-issue-867
...
Allow mass-unassigning of issues
2015-02-26 09:04:23 -08:00
449cf43a55
Add z index for diff header so sticky header stays on top on diff comments.
2015-02-26 09:03:34 -08:00
f980827ba6
Merge branch 'fix_gitlab_importer' into 'master'
...
Fix GitLab && Gitorious importers. Hide already imported projects
Fixes #2060
See merge request !1594
2015-02-26 16:57:26 +00:00
d3c44b1a6c
Fix import status page project links for new Rails.
2015-02-26 09:50:43 +01:00
7fef8456e8
Merge branch 'small-fixes' into 'master'
...
Small fixes
Fixes #2062 and #2061
See merge request !1601
2015-02-26 06:31:50 +00:00
e27f5aef46
Fix sticky diff header
2015-02-25 22:17:46 -08:00
e53dd7526f
Allow mass-unassigning of issues
...
Fixes #867
[ci skip]
2015-02-25 23:57:23 -05:00
8490a8ab2a
Rename bulk_update_context_spec to bulk_update_service_spec
2015-02-25 23:55:53 -05:00
c254cb03d8
Fix affix for issue and merge request with image in description
2015-02-25 20:00:28 -08:00
e993b59b7d
Dont render project entity
2015-02-25 19:53:45 -08:00
a9eba1bde0
No need to block db:rollback for safe migration
2015-02-25 19:51:13 -08:00
128012dba8
More use of shortcut routes
2015-02-25 19:50:01 -08:00
0a4dec24c8
Add explanation to routing method
2015-02-25 19:41:17 -08:00
1da71cc520
Introduce shortcuts for routing helpers
2015-02-25 19:34:16 -08:00
cd6baa1415
Merge branch 'line-is-wrong-test' into 'master'
...
Make test element selection more specific to fix constantly failing test.
Fixes #2051 .
The problem was that there were two `.note-text` elements matching `.files [id^=diff]:nth-child(2) .note-text`, one for the new comment, and one for the (currently hidden) new comment form. The latter one was selected but currently invisible, triggering the following error in poltergeist:
> The element you are trying to interact with is either not part of the DOM, or is not currently visible on the page (perhaps display: none is set). It's possible the element has been replaced by another element and you meant to interact with the new element. If so you need to do a new 'find' in order to get a reference to the new element.
This caused the test to fail.
See merge request !1592
2015-02-26 02:57:22 +00:00
78391fe5a0
Merge branch 'fix-another-migration' into 'master'
...
Prevent another migration from failing due to indirect use of model columns not yet created
See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077
cc @marin
See merge request !1597
2015-02-26 02:53:37 +00:00
5cd304dd5e
Merge branch 'fix-invalid-syntax' into 'master'
...
Fix git syntax issue for git version older then 1.7.10
For #2067
See merge request !1599
2015-02-26 02:49:12 +00:00
6cee8d776b
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-02-25 15:36:28 -08:00
0d884ff2b1
Merge branch 'extend_markdown_upload' into 'master'
...
Generalizes image upload in drag and drop in markdown to all files
From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.
- [x] Rebase on master when !1553 is merged in
See merge request !1530
2015-02-25 23:36:03 +00:00
1511506f72
Fix git syntax issue
2015-02-25 15:17:20 -08:00
43f1ab9c12
Move CHANGELOG entry to 7.9.
2015-02-25 23:25:08 +01:00
4ac5281f59
Merge pull request #8486 from kfei/docker/graceful-shutdown
...
Gracefully shutdown services in Docker container
2015-02-25 14:04:32 -08:00
Robert Schilling